diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-25 11:08:05 -0800 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-25 11:08:05 -0800 |
| commit | bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e (patch) | |
| tree | 56abaf30f11ad2f24b9fb7729f74c5fff50fbd93 /nixos/modules/virtualisation/virtualbox-host.nix | |
| parent | 1f9494b752082ec3ac048e56d1c6364a2e23a675 (diff) | |
| parent | 104c3db6594043dbb81005303f055b02145305a5 (diff) | |
| download | nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.gz nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.bz2 nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.lz nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.xz nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.tar.zst nixpkgs-bae00e8aa8f3faff90e28e19cd5074b8c26d0d0e.zip | |
setcap-wrapper: Merging with upstream master and resolving conflicts
Diffstat (limited to 'nixos/modules/virtualisation/virtualbox-host.nix')
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-host.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index ee8569d3c0c..b3647482f2c 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -4,10 +4,15 @@ with lib; let cfg = config.virtualisation.virtualbox.host; - virtualbox = config.boot.kernelPackages.virtualbox.override { + + virtualbox = pkgs.virtualbox.override { inherit (cfg) enableHardening headless; }; + kernelModules = config.boot.kernelPackages.virtualbox.override { + inherit virtualbox; + }; + in { @@ -60,7 +65,7 @@ in config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ virtualbox ]; + boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; security.permissionsWrappers.setuid = let |