From 65393ca8d3b959657e16e402a3db3ac8f1fdb6ed Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Fri, 12 Dec 2014 00:15:28 +0100 Subject: virtualbox: Unbreak the nixos module. --- nixos/modules/programs/virtualbox-host.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix index 45d5ec01d302..25f17e3c0607 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/programs/virtualbox-host.nix @@ -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; } ]; - }; + })]); } -- cgit 1.4.1