swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues 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 "";
fillOptionsDefaults = defs: opts: opts //
addDefaultOptionValues = defs: opts: opts //
builtins.listToAttrs (map (defName:
{ name = defName;
value =
@ -226,8 +226,8 @@ rec {
# `defValue' is an attribute set containing options.
# So recurse.
if builtins.hasAttr defName opts && builtins.isAttrs optValue
then fillOptionsDefaults defValue optValue
else fillOptionsDefaults defValue {};
then addDefaultOptionValues defValue optValue
else addDefaultOptionValues defValue {};
}
) (builtins.attrNames defs));