ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Fix previous commit.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13373
This commit is contained in:
Nicolas Pierron 2008-11-23 01:23:32 +00:00
parent 249a3a314f
commit 53e6c77aca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/lib/default.nix
View File

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