From 89b1dd8ddec8ee50630855fc8a63835754f23e54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Oct 2013 16:14:58 +0100
Subject: Fix environment.checkConfigurationOptions

This requires delaying the declaredness check until later, otherwise
we get an infinite recursion querying
environment.checkConfigurationOptions.
---
 nixos/lib/eval-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nixos/lib/eval-config.nix')

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index ece78691a848..5e1ce69158fd 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -19,7 +19,7 @@ rec {
   inherit (pkgs.lib.evalModules {
     modules = modules ++ baseModules;
     args = extraArgs;
-    inherit check;
+    check = check && options.environment.checkConfigurationOptions.value;
   }) config options;
 
   # These are the extra arguments passed to every module.  In
-- 
cgit 1.4.1