diff options
| author | David Guibert <david.guibert@gmail.com> | 2011-02-02 20:05:47 +0000 |
|---|---|---|
| committer | David Guibert <david.guibert@gmail.com> | 2011-02-02 20:05:47 +0000 |
| commit | a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62 (patch) | |
| tree | 02f33e292621fbfe7ced8f07930fb82474f2e865 /pkgs/applications | |
| parent | e87f7fdf1bcfb2dc6217fd9a746962744f6dd64c (diff) | |
| download | nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.tar nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.tar.gz nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.tar.bz2 nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.tar.lz nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.tar.xz nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.tar.zst nixpkgs-a45d06f7fbdfe5d698df4f6fb8cdbde6b8a3df62.zip | |
Merge commit 'f54c97b' into HEAD
svn path=/nixpkgs/trunk/; revision=25768
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f0af4411d9c..52c1f46fdae 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -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 |