removed mkDerivationByConfiguration, using composableDerivation instead

qgis, vim_configurable both work now

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

1 files changed, 18 insertions, 19 deletions

diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 4b0e05acf98..70211e928ee 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,30 +1,29 @@
-args:
-let edf = args.lib.enableDisableFeature; in
-( args.mkDerivationByConfiguration {
-    flagConfig = { }
+args: with args;
+let inherit (args.composableDerivation) composableDerivation edf; in
+composableDerivation {
+  initial = {
+    flags = { }
       # TODO! implement flags
       # I want to get kino and cinelerra working. That's why I don't spend more time on this now
-      // edf "libtool_lock" "libtool_lock" { } #avoid locking (might break parallel builds)
-      // edf "asm" "asm" { } #disable use of architecture specific assembly code
-      // edf "sdl" "sdl" { } #enable use of SDL for display
-      // edf "gtk" "gtk" { } #disable use of gtk for display
-      // edf "xv" "xv" { } #disable use of XVideo extension for display
-      // edf "gprof" "gprof" { } #enable compiler options for gprof profiling
-    ;
+      // edf { name = "libtool_lock"; } #avoid locking (might break parallel builds)
+      // edf { name ="asm"; } #disable use of architecture specific assembly code
+      // edf { name ="sdl"; } #enable use of SDL for display
+      // edf { name ="gtk"; } #disable use of gtk for display
+      // edf { name ="xv"; } #disable use of XVideo extension for display
+      // edf { name ="gprof"; }; #enable compiler options for gprof profiling
 
-    extraAttrs = co : {
-      name = "libdv-1.0.0";
+    name = "libdv-1.0.0";
 
-      src = args.fetchurl {
-        url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
-        sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
-      };
+    src = args.fetchurl {
+      url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
+      sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
+    };
 
-    meta = { 
+    meta = {
       description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
       homepage = http://sourceforge.net/projects/libdv/;
       # you can choose one of the following licenses: 
       license = [];
     };
   };
-} ) args
+}