From 5417fb5b3b54c50fcd639a534396de4112081fcb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 14 Oct 2009 12:37:52 +0000 Subject: Added some x86-64 support to the VirtualBox guest additions svn path=/nixpkgs/trunk/; revision=17798 --- .../virtualbox/guest-additions/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d959ef130790..676e4c947d8f 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,8 +12,17 @@ stdenv.mkDerivation { buildCommand = '' isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run - chmod 755 ./VBoxLinuxAdditions-x86.run - ./VBoxLinuxAdditions-x86.run --noexec --keep + ${if stdenv.system == "i686-linux" then '' + 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 # Build kernel modules @@ -28,7 +37,14 @@ stdenv.mkDerivation { # Change the interpreter for various binaries for i in ./{mount.vboxsf,vboxadd-service,VBoxClient,VBoxControl} 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 # Change rpath for various binaries and libraries -- cgit 1.4.1