From b93e8bab3ade8481176fe0813414be9aaa3cc086 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 4 Mar 2015 12:05:04 +0100
Subject: [PATCH] nixos/xen: do not use derivation in the default values

The xen package is broken on i686, so this would break the generation
of the nixos manual.
---
 nixos/modules/virtualisation/xen-dom0.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 157da76d752..1128c5e005e 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -59,11 +59,12 @@ in
 
     virtualisation.xen.stored =
       mkOption {
-        default = "${pkgs.xen}/bin/oxenstored";
+        default = null;
         description =
           ''
-            Xen Store daemon to use.
+            Xen Store daemon to use. Defaults to oxenstored of the xen package.
           '';
+        apply = x: if x == null then "${xen}/bin/oxenstored" else x;
       };
 
     virtualisation.xen.trace =