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

@@ -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

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;