diff options
author | Peter Simons <simons@cryp.to> | 2013-01-04 21:00:53 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-01-04 21:00:53 +0100 |
commit | 9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2 (patch) | |
tree | 366107df9c9c85749c9c601ba6a9115f7714badd /pkgs/applications/virtualization | |
parent | 7505cb5f9a3e92b864f36f1f52ee63caaa8b40af (diff) | |
parent | 440bc6ec2a17697b379a637b9e84a274bec3a719 (diff) | |
download | nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.gz nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.bz2 nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.lz nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.xz nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.zst nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.zip |
Merge branch 'master' into stdenv-updates.
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 219f8531787d..9483868bc5e3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper -, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: +, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor +, dbus }: let version = "4.2.4"; in @@ -13,7 +14,7 @@ stdenv.mkDerivation { KERN_DIR = "${kernel}/lib/modules/*/build"; - buildInputs = [ patchelf cdrkit makeWrapper ]; + buildInputs = [ patchelf cdrkit makeWrapper dbus ]; installPhase = '' mkdir -p $out @@ -56,7 +57,7 @@ stdenv.mkDerivation { cd .. # Change the interpreter for various binaries - for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} + for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf do ${if stdenv.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i @@ -66,14 +67,12 @@ stdenv.mkDerivation { '' else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } + patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i done - # Change rpath for various binaries and libraries - patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient - for i in lib/VBoxOGL*.so do - patchelf --set-rpath $out/lib $i + patchelf --set-rpath $out/lib:${dbus}/lib $i done # Remove references to /usr from various scripts and files @@ -82,6 +81,7 @@ stdenv.mkDerivation { # Install binaries mkdir -p $out/sbin + install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf install -m 755 sbin/VBoxService $out/sbin mkdir -p $out/bin |