From 53e6c77acaab071f0155065b89f37dd4855e668f Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sun, 23 Nov 2008 01:23:32 +0000 Subject: [PATCH] Fix previous commit. svn path=/nixpkgs/trunk/; revision=13373 --- pkgs/lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 171c2f065f8..0a8dc6623e5 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -240,7 +240,7 @@ rec { else if builtins.isList val then [] else if builtins.isAttrs val then {} # else if builtins.isString val then "" - # else if builtins.isBoolean val then false + else if (val == true || val == false) then false else null; # Return a list of integers from `first' up to and including `last'. @@ -535,7 +535,7 @@ rec { rmRequireIf (optionSet config configFun); in config: merge "" ( - uniqFlattenAttr (processConfig) "require" [] (toList opts) + uniqFlattenAttr (processConfig config) "require" [] (toList opts) ); fixOptionSets = merge: pkgs: opts: