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, 3 insertions, 3 deletions

diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix
index 22be0c941b73..130b128149b8 100644
--- a/pkgs/tools/networking/nc6/1.0.nix
+++ b/pkgs/tools/networking/nc6/1.0.nix
@@ -1,5 +1,5 @@
-args : with args; with builderDefs {src="";} null;
-let localDefs = builderDefs (rec {
+args : with args; with builderDefs;
+let localDefs = builderDefs.meta.function (rec {
     src = /* put a fetchurl here */
     fetchurl {
       url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
@@ -8,7 +8,7 @@ let localDefs = builderDefs (rec {
 
     buildInputs = [];
     configureFlags = [];
-    }) null; /* null is a terminator for sumArgs */
+    });
 in with localDefs;
 stdenv.mkDerivation rec {
   name = "nc6-"+version;