MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vbox-guest: Merge pull request #9063 from ctheune.

Browse source 
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.
This commit is contained in:
aszlig 2015-08-04 01:16:35 +02:00
commit a26edf0f77
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -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