diff options
author | Tim Dysinger <tim@dysinger.net> | 2012-12-29 17:45:46 -1000 |
---|---|---|
committer | Tim Dysinger <tim@dysinger.net> | 2012-12-30 16:04:48 -1000 |
commit | 58a57efc8a0d6eb2d2b992454a074a070d31cc4c (patch) | |
tree | 21fa60a5f589d5a6e685149ea518f84a8b645756 /pkgs/applications/virtualization | |
parent | 451974f679ae3f294ab4a6bfd4756bd78d48d5aa (diff) | |
download | nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.tar nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.tar.gz nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.tar.bz2 nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.tar.lz nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.tar.xz nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.tar.zst nixlib-58a57efc8a0d6eb2d2b992454a074a070d31cc4c.zip |
Add mount.vboxsf back to the expression, add dbus & patchelf everything so it works
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 |