commit c792c60b8a97daa7efe41a6e4954497ae410e0c1 · pyrox.dev/nixpkgs

+34 -11

nixos/modules/virtualisation/virtualbox-guest.nix

···

       9
        
         cfg = config.virtualisation.virtualbox.guest;

     

       10
        
         kernel = config.boot.kernelPackages;

     

       11
        
       

     

       12
       -
         mkVirtualBoxUserService = serviceArgs: {

     

       13
        
           description = "VirtualBox Guest User Services ${serviceArgs}";

     

       14
        
       

     

       15
        
           wantedBy = [ "graphical-session.target" ];

     
···

       24
        
           # Check if the display environment is ready, otherwise fail

     

       25
        
           preStart = "${pkgs.bash}/bin/bash -c \"if [ -z $DISPLAY ]; then exit 1; fi\"";

     

       26
        
           serviceConfig = {

     

       27
       -
             ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxClient --foreground ${serviceArgs}";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
             # Wait after a failure, hoping that the display environment is ready after waiting

     

       29
        
             RestartSec = 2;

     

       30
        
             Restart = "always";

     

       31
        
           };

     

       32
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
       in

     

       34
        
       {

     

       35
        
         imports = [

     
···

       73
        
             type = lib.types.bool;

     

       74
        
             description = "Whether to enable drag and drop support.";

     

       75
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       76
        
         };

     

       77
        
       

     

       78
        
         ###### implementation

     
···

       91
        
       

     

       92
        
               boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];

     

       93
        
       

     

       94
       -
               boot.supportedFilesystems = [ "vboxsf" ];

     

       95
       -
               boot.initrd.supportedFilesystems = [ "vboxsf" ];

     

       96
       -
       

     

       97
       -
               users.groups.vboxsf.gid = config.ids.gids.vboxsf;

     

       98
       -
       

     

       99
        
               systemd.services.virtualbox = {

     

       100
        
                 description = "VirtualBox Guest Services";

     

       101
        
       

     
···

       117
        
                 SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"

     

       118
        
               '';

     

       119
        
       

     

       120
       -
               systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session";

     

       121
        
             }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       122
        
             (lib.mkIf cfg.clipboard {

     

       123
       -
               systemd.user.services.virtualboxClientClipboard = mkVirtualBoxUserService "--clipboard";

     

       124
        
             })

     

       125
        
             (lib.mkIf cfg.seamless {

     

       126
       -
               systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserService "--seamless";

     

       127
        
             })

     

       128
        
             (lib.mkIf cfg.dragAndDrop {

     

       129
       -
               systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop";

     

       130
        
             })

     

       131
        
           ]

     

       132
        
         );

···

       9
        
         cfg = config.virtualisation.virtualbox.guest;

     

       10
        
         kernel = config.boot.kernelPackages;

     

       11
        
       

     

       12
       +
         mkVirtualBoxUserService = serviceArgs: verbose: {

     

       13
        
           description = "VirtualBox Guest User Services ${serviceArgs}";

     

       14
        
       

     

       15
        
           wantedBy = [ "graphical-session.target" ];

     
···

       24
        
           # Check if the display environment is ready, otherwise fail

     

       25
        
           preStart = "${pkgs.bash}/bin/bash -c \"if [ -z $DISPLAY ]; then exit 1; fi\"";

     

       26
        
           serviceConfig = {

     

       27
       +
             ExecStart =

     

       28
       +
               "@${kernel.virtualboxGuestAdditions}/bin/VBoxClient"

     

       29
       +
               + (lib.strings.optionalString verbose " --verbose")

     

       30
       +
               + " --foreground ${serviceArgs}";

     

       31
        
             # Wait after a failure, hoping that the display environment is ready after waiting

     

       32
        
             RestartSec = 2;

     

       33
        
             Restart = "always";

     

       34
        
           };

     

       35
        
         };

     

       36
       +
       

     

       37
       +
         mkVirtualBoxUserX11OnlyService =

     

       38
       +
           serviceArgs: verbose:

     

       39
       +
           (mkVirtualBoxUserService serviceArgs verbose)

     

       40
       +
           // {

     

       41
       +
             unitConfig.ConditionEnvironment = "XDG_SESSION_TYPE=x11";

     

       42
       +
           };

     

       43
        
       in

     

       44
        
       {

     

       45
        
         imports = [

     
···

       83
        
             type = lib.types.bool;

     

       84
        
             description = "Whether to enable drag and drop support.";

     

       85
        
           };

     

       86
       +
       

     

       87
       +
           verbose = lib.mkOption {

     

       88
       +
             default = false;

     

       89
       +
             type = lib.types.bool;

     

       90
       +
             description = "Whether to verbose logging for guest services.";

     

       91
       +
           };

     

       92
       +
       

     

       93
       +
           vboxsf = lib.mkOption {

     

       94
       +
             default = true;

     

       95
       +
             type = lib.types.bool;

     

       96
       +
             description = "Whether to load vboxsf";

     

       97
       +
           };

     

       98
        
         };

     

       99
        
       

     

       100
        
         ###### implementation

     
···

       113
        
       

     

       114
        
               boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];

     

       115
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       116
        
               systemd.services.virtualbox = {

     

       117
        
                 description = "VirtualBox Guest Services";

     

       118
        
       

     
···

       134
        
                 SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"

     

       135
        
               '';

     

       136
        
       

     

       137
       +
               systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session" cfg.verbose;

     

       138
        
             }

     

       139
       +
             (lib.mkIf cfg.vboxsf {

     

       140
       +
               boot.supportedFilesystems = [ "vboxsf" ];

     

       141
       +
               boot.initrd.supportedFilesystems = [ "vboxsf" ];

     

       142
       +
       

     

       143
       +
               users.groups.vboxsf.gid = config.ids.gids.vboxsf;

     

       144
       +
             })

     

       145
        
             (lib.mkIf cfg.clipboard {

     

       146
       +
               systemd.user.services.virtualboxClientClipboard = mkVirtualBoxUserService "--clipboard" cfg.verbose;

     

       147
        
             })

     

       148
        
             (lib.mkIf cfg.seamless {

     

       149
       +
               systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserX11OnlyService "--seamless" cfg.verbose;

     

       150
        
             })

     

       151
        
             (lib.mkIf cfg.dragAndDrop {

     

       152
       +
               systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop" cfg.verbose;

     

       153
        
             })

     

       154
        
           ]

     

       155
        
         );

+14 -4

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

···

       8
        
         zlib,

     

       9
        
         patchelf,

     

       10
        
         makeWrapper,

     

       0
        
       
     

       0
        
       
     

       11
        
       }:

     

       12
        
       let

     

       13
        
         virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { };

     

       14
       -
       

     

       15
       -
         # Forced to 1.18; vboxvideo doesn't seem to provide any newer ABI,

     

       16
       -
         # and nixpkgs doesn't support older ABIs anymore.

     

       17
       -
         xserverABI = "118";

     

       18
        
       

     

       19
        
         # Specifies how to patch binaries to make sure that libraries loaded using

     

       20
        
         # dlopen are found. We grep binaries for specific library names and patch

     
···

       31
        
           {

     

       32
        
             name = "libXrandr.so";

     

       33
        
             pkg = xorg.libXrandr;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
           }

     

       35
        
         ];

     

       36
        
       in

···

       8
        
         zlib,

     

       9
        
         patchelf,

     

       10
        
         makeWrapper,

     

       11
       +
         wayland,

     

       12
       +
         libX11,

     

       13
        
       }:

     

       14
        
       let

     

       15
        
         virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       

     

       17
        
         # Specifies how to patch binaries to make sure that libraries loaded using

     

       18
        
         # dlopen are found. We grep binaries for specific library names and patch

     
···

       29
        
           {

     

       30
        
             name = "libXrandr.so";

     

       31
        
             pkg = xorg.libXrandr;

     

       32
       +
           }

     

       33
       +
           {

     

       34
       +
             name = "libwayland-client.so";

     

       35
       +
             pkg = wayland;

     

       36
       +
           }

     

       37
       +
           {

     

       38
       +
             name = "libX11.so";

     

       39
       +
             pkg = libX11;

     

       40
       +
           }

     

       41
       +
           {

     

       42
       +
             name = "libXt.so";

     

       43
       +
             pkg = xorg.libXt;

     

       44
        
           }

     

       45
        
         ];

     

       46
        
       in