diff options
author | ambrop7@gmail.com <Ambroz Bizjak> | 2014-12-12 00:15:28 +0100 |
---|---|---|
committer | ambrop7@gmail.com <Ambroz Bizjak> | 2014-12-12 00:16:33 +0100 |
commit | 65393ca8d3b959657e16e402a3db3ac8f1fdb6ed (patch) | |
tree | 270cb75396656ff03a9146e2ef85c4e0cca0e26d /nixos | |
parent | 8b512261be9cfbbdc8a55f0a10efc1c83502222c (diff) | |
download | nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.tar nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.tar.gz nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.tar.bz2 nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.tar.lz nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.tar.xz nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.tar.zst nixlib-65393ca8d3b959657e16e402a3db3ac8f1fdb6ed.zip |
virtualbox: Unbreak the nixos module.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/programs/virtualbox-host.nix | 6 |
1 files changed, 3 insertions, 3 deletions
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; } ]; - }; + })]); } |