removed mkDerivationByConfiguration, using composableDerivation instead

qgis, vim_configurable both work now svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
parent 5ab6464edb
commit e996113be7
22 changed files with 661 additions and 1230 deletions
@@ -1,24 +1,19 @@
-args:
-( args.mkDerivationByConfiguration {
-    flagConfig = {
-      mandatory = { buildInputs = [ "perl" ]; };
-      # many options I don't know wether they should be default .. 
-    }; 
+args: with args;
+stdenv.mkDerivation {
+  name = "squid-3.0-stable5";

-    extraAttrs = co : {
-      name = "squid-3.0-stable5";
+  buildInputs = [perl];

-      src = args.fetchurl {
-        url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
-        sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
-      };
-
-      configureFlags = ["--enable-ipv6"];
-
-      meta = { 
-        description = "http-proxy";
-        homepage = "http://www.squid-cache.org";
-        license = "GPL2";
-      };
+  src = args.fetchurl {
+    url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
+    sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
  };
-} ) args
+
+  configureFlags = ["--enable-ipv6"];
+
+  meta = {
+    description = "http-proxy";
+    homepage = "http://www.squid-cache.org";
+    license = "GPL2";
+  };
+}