about summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2018-02-26 22:50:46 +0000
committervolth <volth@volth.com>2018-03-08 23:45:28 +0000
commit632e9e62c817bdaa163510429625b5f48b6a18e4 (patch)
tree568250ae75b858c0a0e920c93309f51efe55ba03 /nixos/modules/virtualisation
parent62bcd3b02e003f1bf100597c05c4c5a5c4e269cb (diff)
downloadnixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.tar
nixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.tar.gz
nixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.tar.bz2
nixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.tar.lz
nixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.tar.xz
nixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.tar.zst
nixlib-632e9e62c817bdaa163510429625b5f48b6a18e4.zip
libvirt: 3.10.0 -> 4.1.0
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/libvirtd.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index a369b7ddbe1d..024db7f87c2e 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -119,18 +119,10 @@ in {
       after = [ "systemd-udev-settle.service" ]
               ++ optional vswitch.enable "vswitchd.service";
 
-      environment = {
-        LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
-      };
+      environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
 
-      path = with pkgs; [
-          bridge-utils
-          dmidecode
-          dnsmasq
-          ebtables
-          cfg.qemuPackage # libvirtd requires qemu-img to manage disk images
-        ]
-        ++ optional vswitch.enable vswitch.package;
+      path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
+             ++ optional vswitch.enable vswitch.package;
 
       preStart = ''
         mkdir -p /var/log/libvirt/qemu -m 755