Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index d1f6321e72af..1b2ba4e4226d 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -458,8 +458,11 @@ args: with args; with stringsWithDeps; with lib;
 
         extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args;
 
-        builderDefsPackage = bd: func: args: (
-        let localDefs = bd (func ((bd null) // args)) args null; in
+        # for overrides..
+	builderDefsArgs = args;
+
+        innerBuilderDefsPackage = bd: func: args: (
+        let localDefs = bd.meta.function ((func (bd // args)) // args); in
 
         stdenv.mkDerivation ((rec {
           inherit (localDefs) name;
@@ -471,6 +474,9 @@ args: with args; with stringsWithDeps; with lib;
         } else {}) // extraDerivationAttrs)
         );
 
+	builderDefsPackage = bd: func: args: (composedArgsAndFun 
+	  (innerBuilderDefsPackage bd func) ((func (bd // args)) // args));
+
    generateFontsFromSFD = noDepEntry(''
            for i in *.sfd; do
                 ${args.fontforge}/bin/fontforge -c \