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, 24 insertions, 26 deletions

diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix
index 548aad3bc27a..54418c1bc1ee 100644
--- a/pkgs/misc/gxemul/default.nix
+++ b/pkgs/misc/gxemul/default.nix
@@ -1,37 +1,35 @@
 args: with args;
 let edf = composableDerivation.edf;
     name = "gxemul-0.4.6"; in
-composableDerivation.composableDerivation {
+composableDerivation.composableDerivation {} {
 
-  initial = {
-    inherit name;
-    flags = {
-        doc   = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
-        demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
-        man   = { installPhase = "cp -r ./man \$out/;";};
-    };
-
-    cfg = {
-      docSupport = true;
-      demosSupport = true;
-      manSupport = true;
-    };
+  inherit name;
+  flags = {
+      doc   = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
+      demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
+      man   = { installPhase = "cp -r ./man \$out/;";};
+  };
 
-    installPhase = "ensureDir \$out/bin; cp gxemul \$out/bin;";
+  cfg = {
+    docSupport = true;
+    demosSupport = true;
+    manSupport = true;
+  };
 
-    src = fetchurl {
-      url = http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz;
-      sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
-    };
+  installPhase = "ensureDir \$out/bin; cp gxemul \$out/bin;";
 
-    configurePhase="./configure";
+  src = fetchurl {
+    url = http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz;
+    sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
+  };
 
-    meta = {
-      license = "BSD";
-      description = "A Machine Emulator, Mainly emulates MIPS, but supports other CPU type";
-      homepage = http://gavare.se/gxemul/;
-    };
+  configurePhase="./configure";
 
-    mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
+  meta = {
+    license = "BSD";
+    description = "A Machine Emulator, Mainly emulates MIPS, but supports other CPU type";
+    homepage = http://gavare.se/gxemul/;
   };
+
+  mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
 }