alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

virtualbox: Unbreak the nixos module.

Browse source 
(cherry picked from commit 65393ca8d3)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
ambrop7@gmail.com 2014-12-12 00:15:28 +01:00 committed by Domen Kožar
parent 268f3f4cc7
commit c19ca69ac8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/programs/virtualbox-host.nix
View file

@ -16,7 +16,7 @@ in
};
};
config = mkIf config.services.virtualboxHost.enable {
config = mkIf config.services.virtualboxHost.enable (mkMerge [{
boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
boot.extraModulePackages = [ virtualbox ];
environment.systemPackages = [ virtualbox ];
@ -51,7 +51,7 @@ in
'';
# Since we lack the right setuid binaries, set up a host-only network by default.
} // mkIf config.services.virtualboxHost.addNetworkInterface {
} (mkIf config.services.virtualboxHost.addNetworkInterface {
systemd.services."vboxnet0" =
{ description = "VirtualBox vboxnet0 Interface";
requires = [ "dev-vboxnetctl.device" ];
@ -73,5 +73,5 @@ in
};
networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
};
})]);
}