diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2008-11-23 01:23:32 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2008-11-23 01:23:32 +0000 |
| commit | 53e6c77acaab071f0155065b89f37dd4855e668f (patch) | |
| tree | 0f624c59b2753b1bc4410a6825c2b224f6208343 /pkgs/lib/default.nix | |
| parent | 249a3a314fef1549ca439a0676e7e6cb0dfb263e (diff) | |
Fix previous commit.
svn path=/nixpkgs/trunk/; revision=13373
Diffstat (limited to 'pkgs/lib/default.nix')
| -rw-r--r-- | pkgs/lib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 171c2f065f8cd..0a8dc6623e533 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: |