JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f54c97b' into HEAD

Browse Source 
svn path=/nixpkgs/trunk/; revision=25768
This commit is contained in:
David Guibert 2011-02-02 20:05:47 +00:00
parent e87f7fdf1b
commit a45d06f7fb
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -17,22 +17,25 @@ stdenv.mkDerivation {
'';
buildCommand = ''
${if stdenv.system == "i686-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
chmod 755 ./VBoxLinuxAdditions-x86.run
./VBoxLinuxAdditions-x86.run --noexec --keep
''
else if stdenv.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions-amd64.run > ./VBoxLinuxAdditions-amd64.run
chmod 755 ./VBoxLinuxAdditions-amd64.run
./VBoxLinuxAdditions-amd64.run --noexec --keep
${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
chmod 755 ./VBoxLinuxAdditions.run
./VBoxLinuxAdditions.run --noexec --keep
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
# Unpack files
cd install
tar xfvj VBoxGuestAdditions.tar.bz2
${if stdenv.system == "i686-linux" then ''
tar xfvj VBoxGuestAdditions-x86.tar.bz2
''
else if stdenv.system == "x86_64-linux" then ''
tar xfvj VBoxGuestAdditions-amd64.tar.bz2
''
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
}
# Build kernel modules
cd src
@ -41,9 +44,11 @@ stdenv.mkDerivation {
do
cd $i
sed -i -e "s/depmod/echo/g" Makefile
sed -i -e "s/depmod/echo/g" */Makefile
make
cd ..
done
cd ..
# Change the interpreter for various binaries