removed mkDerivationByConfiguration, using composableDerivation instead

qgis, vim_configurable both work now

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

1 files changed, 29 insertions, 26 deletions

diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix
index e7d0c92a1c56..548aad3bc27a 100644
--- a/pkgs/misc/gxemul/default.nix
+++ b/pkgs/misc/gxemul/default.nix
@@ -1,34 +1,37 @@
-args: with args.lib; with args;
-let
-  name="gxemul-0.4.6";
-  co = chooseOptionsByFlags {
-    inherit args;
-    flagDescr = {
-      mandatory = { install = "ensureDir \$out/bin; cp gxemul \$out/bin;"; };
-      doc   = { install = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
-      demos = { install = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
-      man   = { install = "cp -r ./man \$out/;";};
+args: with args;
+let edf = composableDerivation.edf;
+    name = "gxemul-0.4.6"; in
+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/;";};
     };
-    optionals = ["libX11"];
-    defaultFlags = [ "demos" "doc" ];
-  };
-in stdenv.mkDerivation {
 
-  inherit name;
-  inherit (co) /* flags */ buildInputs configureFlags;
+    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";
+    };
+
+    configurePhase="./configure";
 
-  installPhase = concatStrings ( catAttrs "install" co.flatOptions );
+    meta = {
+      license = "BSD";
+      description = "A Machine Emulator, Mainly emulates MIPS, but supports other CPU type";
+      homepage = http://gavare.se/gxemul/;
+    };
 
-  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}"; };
   };
 }