gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setcap-wrapper: Merging with upstream master and resolving conflicts

Browse Source
This commit is contained in:
Parnell Springmeyer
2017-01-25 11:08:05 -08:00
parent 1f9494b752 104c3db659
commit bae00e8aa8
4612 changed files with 200761 additions and 124566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/virtualisation/virtualbox-host.nix
View File

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