diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-11-09 18:07:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-11-09 18:07:14 +0000 |
| commit | 9d1fc7c5ba00ed2b90889d629eb16c2b0778f106 (patch) | |
| tree | c819d3e31c7d4ec4461a982bd425c31b238a7177 /pkgs/lib | |
| parent | b5f893d92a651bc824450b55af5ee9a42e72e574 (diff) | |
| download | nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.tar nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.tar.gz nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.tar.bz2 nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.tar.lz nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.tar.xz nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.tar.zst nixlib-9d1fc7c5ba00ed2b90889d629eb16c2b0778f106.zip | |
svn path=/nixpkgs/trunk/; revision=9617
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 4e2e213bdfba..0ac86d1e48d5 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -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)); |