commit 07edb2483d35946cd3b299b4c113a554b2b1a2e0 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/virtualisation/virtualbox-guest.nix

···

       54
       54
        
       

     

       55
       55
        
               unitConfig.ConditionVirtualization = "oracle";

     

       56
       56
        
       

     

       57
       57
       -
               serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";

     

       57
       57
       +
               serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground";

     

       58
       58
        
             };

     

       59
       59
        
       

     

       60
       60
        
           services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];

+2 -2

nixos/tests/virtualbox.nix

···

       8
       8
        
               #!${pkgs.stdenv.shell} -xe

     

       9
       9
        
               export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"

     

       10
       10
        
       

     

       11
       11
       -
               ${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService

     

       11
       11
       +
               ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService

     

       12
       12
        
               ${(attrs.vmScript or (const "")) pkgs}

     

       13
       13
        
       

     

       14
       14
        
               i=0

     
···

       39
       39
        
           ];

     

       40
       40
        
       

     

       41
       41
        
           boot.initrd.extraUtilsCommands = ''

     

       42
       42
       -
             copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf"

     

       42
       42
       +
             copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf"

     

       43
       43
        
             copy_bin_and_libs "${pkgs.utillinux}/bin/unshare"

     

       44
       44
        
             ${(attrs.extraUtilsCommands or (const "")) pkgs}

     

       45
       45
        
           '';

+2 -3

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

···

       87
       87
        
           sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all

     

       88
       88
        
       

     

       89
       89
        
           # Install binaries

     

       90
       90
       -
           mkdir -p $out/sbin

     

       91
       91
       -
           install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf

     

       92
       92
       -
           install -m 755 sbin/VBoxService $out/sbin

     

       90
       90
       +
           install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf

     

       91
       91
       +
           install -D -m 755 sbin/VBoxService $out/bin/VBoxService

     

       93
       92
        
       

     

       94
       93
        
           mkdir -p $out/bin

     

       95
       94
        
           install -m 755 bin/VBoxClient $out/bin