replacing applyAndFun by lib.defaultOverridableDelayableArgs

applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

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

1 files changed, 25 insertions, 28 deletions

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 10cc4d94d40..d30f55b95c6 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,38 +1,35 @@
 args: with args;
 let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {
+composableDerivation {} {
 
-  initial = {
+  buildInputs = [ "which" ]; # which is needed for the autogen.sh
 
-    buildInputs = [ "which" ]; # which is needed for the autogen.sh
+  flags =
+  # python and ruby untested 
+    edf { name = "python"; enable = { buildInputs = [ python ]; }; };
+    # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
+    # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-    flags =
-    # python and ruby untested 
-      edf { name = "python"; enable = { buildInputs = [ python ]; }; };
-      # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
-      # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
+  name = "geos-3.0.3";
 
-    name = "geos-3.0.3";
-
-    src = fetchurl {
-        url = http://download.osgeo.org/geos/geos-3.0.3.tar.bz2;
-        sha256 = "1pxk20jcbyidp3bvip1vdf8wfw2wvh8pcn810qkf1y3zfnki0c7k";
-    };
+  src = fetchurl {
+      url = http://download.osgeo.org/geos/geos-3.0.3.tar.bz2;
+      sha256 = "1pxk20jcbyidp3bvip1vdf8wfw2wvh8pcn810qkf1y3zfnki0c7k";
+  };
 
-    # for development version. can be removed ?
-    #configurePhase = "
-    #  [ -f configure ] || \\
-    #  LIBTOOLIZE=libtoolize ./autogen.sh
-    #  [>{ automake --add-missing; autoconf; }
-    #  unset configurePhase; configurePhase
-    #";
+  # for development version. can be removed ?
+  #configurePhase = "
+  #  [ -f configure ] || \\
+  #  LIBTOOLIZE=libtoolize ./autogen.sh
+  #  [>{ automake --add-missing; autoconf; }
+  #  unset configurePhase; configurePhase
+  #";
 
-    meta = {
-        description = "C++ port of the Java Topology Suite (JTS)"
-          + "- all the OpenGIS \"Simple Features for SQL\" spatial predicate functions and spatial operators,"
-          + " as well as specific JTS topology functions such as IsValid";
-        homepage = http://geos.refractions.net/;
-        license = "GPL";
-    };
+  meta = {
+      description = "C++ port of the Java Topology Suite (JTS)"
+        + "- all the OpenGIS \"Simple Features for SQL\" spatial predicate functions and spatial operators,"
+        + " as well as specific JTS topology functions such as IsValid";
+      homepage = http://geos.refractions.net/;
+      license = "GPL";
   };
 }