summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2017-03-23 23:22:29 +0000
committerRobin Gloster <mail@glob.in>2017-03-24 01:54:04 +0100
commit2822bacd60121b9305ed6244ec76f7be42fbbf5a (patch)
tree424c1304c4c003550d6449d8f420ac4a1a5e51bb /nixos/modules/virtualisation
parentae1034ea965f9f86b6cbf1064071923650907618 (diff)
downloadnixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.tar
nixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.tar.gz
nixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.tar.bz2
nixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.tar.lz
nixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.tar.xz
nixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.tar.zst
nixlib-2822bacd60121b9305ed6244ec76f7be42fbbf5a.zip
nixos: xen: condition default packages on `enable`
Closes #23690.
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/xen-dom0.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 57487f704519..1f5b6bd1d808 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -29,7 +29,6 @@ in
 
     virtualisation.xen.package = mkOption {
       type = types.package;
-      default = pkgs.xen;
       defaultText = "pkgs.xen";
       example = literalExample "pkgs.xen-light";
       description = ''
@@ -39,7 +38,6 @@ in
 
     virtualisation.xen.qemu = mkOption {
       type = types.path;
-      default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
       defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
       example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
       description = ''
@@ -49,7 +47,6 @@ in
 
     virtualisation.xen.qemu-package = mkOption {
       type = types.package;
-      default = pkgs.xen;
       defaultText = "pkgs.xen";
       example = literalExample "pkgs.qemu_xen-light";
       description = ''
@@ -136,6 +133,9 @@ in
       message = "Xen currently does not support EFI boot";
     } ];
 
+    virtualisation.xen.package = mkDefault pkgs.xen;
+    virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+    virtualisation.xen.qemu-package = mkDefault pkgs.xen;
     virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
 
     environment.systemPackages = [ cfg.package ];