diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-08-04 01:16:35 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-08-04 01:16:35 +0200 |
| commit | a26edf0f77b670e231001815858cb2348d8a381f (patch) | |
| tree | 0631684151a6282ff41bc93a88be7ffbc818e048 /pkgs/applications/virtualization | |
| parent | f2d3b5ead934a3334f67405cddc705273e736ef1 (diff) | |
| parent | 1fb1360ae2508c1ffe9b858fb13be8548a40b429 (diff) | |
| download | nixlib-a26edf0f77b670e231001815858cb2348d8a381f.tar nixlib-a26edf0f77b670e231001815858cb2348d8a381f.tar.gz nixlib-a26edf0f77b670e231001815858cb2348d8a381f.tar.bz2 nixlib-a26edf0f77b670e231001815858cb2348d8a381f.tar.lz nixlib-a26edf0f77b670e231001815858cb2348d8a381f.tar.xz nixlib-a26edf0f77b670e231001815858cb2348d8a381f.tar.zst nixlib-a26edf0f77b670e231001815858cb2348d8a381f.zip | |
vbox-guest: Merge pull request #9063 from ctheune.
This places mount.vboxsf in $out/bin instead of sbin, because as reported in #9063 it seems that the the mount tools are no longer looking into $storepath/sbin/mount.$what but into $storepath/bin/mount.$what instead. However, I haven't found any commit which changes this behavior and couldn't reproduce it. Also, merging this will break the VirtualBox tests, but I'm merging it anyway in an effort to remove $storepath/sbin from virtualboxGuestAdditions entirely. Tested against virtualbox NixOS VM test, which of course failed as said before.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index b56e80eb3b67..ac447fd50d30 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -87,8 +87,9 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all # Install binaries + mkdir -p $out/bin + install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf 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 |