From 19648abc05e559c39b49fc6fa2a76970aa457b65 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 12 Oct 2009 15:16:22 +0000
Subject: [PATCH] Revert previous commit because this is implicit.  Fix
 property evaluation error which arose when one module define a value with
 "mkDefaultValue" and another module define its value with "mkIf <false>".

svn path=/nixpkgs/trunk/; revision=17759
---
 pkgs/lib/modules.nix    | 2 +-
 pkgs/lib/properties.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 55e33c22614..becd786d8cd 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -118,7 +118,7 @@ rec {
     moduleApply { config = delayProperties; } module;
 
   evalDefinitions = opt: values:
-    if opt ? options && opt.options != [] && opt ? type && opt.type.delayOnGlobalEval then
+    if opt ? type && opt.type.delayOnGlobalEval then
       map (delayPropertiesWithIter opt.type.iter opt.name)
         (evalLocalProperties values)
     else
diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index a911c99bf3f..f28d652d4e6 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -126,7 +126,7 @@ rec {
       filter (x: !isNotdef x) (
         lib.addErrorContext "while evaluating properties." (
           triggerPropertiesGlobalEval (
-            map triggerPropertiesEval valList
+            evalLocalProperties valList
       )))
     else
       valList;