public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn path=/nixpkgs/trunk/; revision=9617

Browse Source
This commit is contained in:
Eelco Dolstra 2007-11-09 18:07:14 +00:00
parent b5f893d92a
commit 9d1fc7c5ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/lib/default.nix
View File

@ -208,7 +208,7 @@ rec {
typeOf = x: if x ? _type then x._type else ""; typeOf = x: if x ? _type then x._type else "";
fillOptionsDefaults = defs: opts: opts // addDefaultOptionValues = defs: opts: opts //
builtins.listToAttrs (map (defName: builtins.listToAttrs (map (defName:
{ name = defName; { name = defName;
value = value =
@ -226,8 +226,8 @@ rec {
# `defValue' is an attribute set containing options. # `defValue' is an attribute set containing options.
# So recurse. # So recurse.
if builtins.hasAttr defName opts && builtins.isAttrs optValue if builtins.hasAttr defName opts && builtins.isAttrs optValue
then fillOptionsDefaults defValue optValue then addDefaultOptionValues defValue optValue
else fillOptionsDefaults defValue {}; else addDefaultOptionValues defValue {};
} }
) (builtins.attrNames defs)); ) (builtins.attrNames defs));