mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-27 22:44:56 +00:00
Added some x86-64 support to the VirtualBox guest additions
svn path=/nixpkgs/trunk/; revision=17798
This commit is contained in:
parent
2db48fc660
commit
5417fb5b3b
@ -12,8 +12,17 @@ stdenv.mkDerivation {
|
|||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
|
isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run
|
||||||
|
|
||||||
chmod 755 ./VBoxLinuxAdditions-x86.run
|
${if stdenv.system == "i686-linux" then ''
|
||||||
./VBoxLinuxAdditions-x86.run --noexec --keep
|
chmod 755 ./VBoxLinuxAdditions-x86.run
|
||||||
|
./VBoxLinuxAdditions-x86.run --noexec --keep
|
||||||
|
''
|
||||||
|
else if stdenv.system == "x86_64-linux" then ''
|
||||||
|
chmod 755 ./VBoxLinuxAdditions-amd64.run
|
||||||
|
./VBoxLinuxAdditions-amd64.run --noexec --keep
|
||||||
|
''
|
||||||
|
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
||||||
|
}
|
||||||
|
|
||||||
cd linux
|
cd linux
|
||||||
|
|
||||||
# Build kernel modules
|
# Build kernel modules
|
||||||
@ -28,7 +37,14 @@ stdenv.mkDerivation {
|
|||||||
# Change the interpreter for various binaries
|
# Change the interpreter for various binaries
|
||||||
for i in ./{mount.vboxsf,vboxadd-service,VBoxClient,VBoxControl}
|
for i in ./{mount.vboxsf,vboxadd-service,VBoxClient,VBoxControl}
|
||||||
do
|
do
|
||||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
|
${if stdenv.system == "i686-linux" then ''
|
||||||
|
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
|
||||||
|
''
|
||||||
|
else if stdenv.system == "x86_64-linux" then ''
|
||||||
|
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i
|
||||||
|
''
|
||||||
|
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
||||||
|
}
|
||||||
done
|
done
|
||||||
|
|
||||||
# Change rpath for various binaries and libraries
|
# Change rpath for various binaries and libraries
|
||||||
|
Loading…
Reference in New Issue
Block a user