From 9bb586943a4665e9dc0af78e2556a7d428f96553 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Mar 2015 12:46:50 +0100
Subject: [PATCH] Deal with virtualisation.xen.stored in a more standard way

---
 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 1128c5e005e..ea9f61aad6a 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -59,12 +59,11 @@ in
 
     virtualisation.xen.stored =
       mkOption {
-        default = null;
+        type = types.path;
         description =
           ''
             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 =
@@ -89,6 +88,8 @@ in
       message = "Xen currently does not support EFI boot";
     } ];
 
+    virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored";
+
     environment.systemPackages = [ xen ];
 
     # Make sure Domain 0 gets the required configuration