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/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix
index 71bee68557a..72c0997cc6a 100644
--- a/pkgs/tools/X11/x11vnc/0.9.3.nix
+++ b/pkgs/tools/X11/x11vnc/0.9.3.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 = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;
@@ -10,7 +10,7 @@ args : with args; with builderDefs {src="";} null;
       zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto
       libXrandr randrproto libXext xextproto inputproto recordproto];
     configureFlags = [];
-  }) null; /* null is a terminator for sumArgs */
+  });
   in with localDefs;
 stdenv.mkDerivation rec {
   name = "x11vnc-"+version;