From 9d1fc7c5ba00ed2b90889d629eb16c2b0778f106 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Nov 2007 18:07:14 +0000
Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=9617

---
 pkgs/lib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index 4e2e213bdfb..0ac86d1e48d 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));