public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: xen: condition default packages on enable

Browse Source 
Closes #23690.
This commit is contained in:
Jan Malakhovski 2017-03-23 23:22:29 +00:00 committed by Robin Gloster
parent ae1034ea96
commit 2822bacd60
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
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/virtualisation/xen-dom0.nix
View File

@ -29,7 +29,6 @@ in
virtualisation.xen.package = mkOption { virtualisation.xen.package = mkOption {
type = types.package; type = types.package;
default = pkgs.xen;
defaultText = "pkgs.xen"; defaultText = "pkgs.xen";
example = literalExample "pkgs.xen-light"; example = literalExample "pkgs.xen-light";
description = '' description = ''
@ -39,7 +38,6 @@ in
virtualisation.xen.qemu = mkOption { virtualisation.xen.qemu = mkOption {
type = types.path; type = types.path;
default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
defaultText = "\${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"; example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
description = '' description = ''
@ -49,7 +47,6 @@ in
virtualisation.xen.qemu-package = mkOption { virtualisation.xen.qemu-package = mkOption {
type = types.package; type = types.package;
default = pkgs.xen;
defaultText = "pkgs.xen"; defaultText = "pkgs.xen";
example = literalExample "pkgs.qemu_xen-light"; example = literalExample "pkgs.qemu_xen-light";
description = '' description = ''
@ -136,6 +133,9 @@ in
message = "Xen currently does not support EFI boot"; 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"; virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];