Fixed building of VirtualBox guest additions on x86-64
svn path=/nixpkgs/trunk/; revision=17806
This commit is contained in:
parent
f581d2a719
commit
a7f52f8233
@ -10,13 +10,13 @@ stdenv.mkDerivation {
|
|||||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||||
buildInputs = [ patchelf cdrkit ];
|
buildInputs = [ patchelf cdrkit ];
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
|
|
||||||
|
|
||||||
${if stdenv.system == "i686-linux" then ''
|
${if stdenv.system == "i686-linux" then ''
|
||||||
|
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
|
||||||
chmod 755 ./VBoxLinuxAdditions-x86.run
|
chmod 755 ./VBoxLinuxAdditions-x86.run
|
||||||
./VBoxLinuxAdditions-x86.run --noexec --keep
|
./VBoxLinuxAdditions-x86.run --noexec --keep
|
||||||
''
|
''
|
||||||
else if stdenv.system == "x86_64-linux" then ''
|
else if stdenv.system == "x86_64-linux" then ''
|
||||||
|
isoinfo -J -i $src -x /VBoxLinuxAdditions-amd64.run > ./VBoxLinuxAdditions-amd64.run
|
||||||
chmod 755 ./VBoxLinuxAdditions-amd64.run
|
chmod 755 ./VBoxLinuxAdditions-amd64.run
|
||||||
./VBoxLinuxAdditions-amd64.run --noexec --keep
|
./VBoxLinuxAdditions-amd64.run --noexec --keep
|
||||||
''
|
''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user