removed mkDerivationByConfiguration, using composableDerivation instead

qgis, vim_configurable both work now

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

1 files changed, 14 insertions, 19 deletions

diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index 3ae7053f92949..95e922f5e95ef 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -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";
-      };
+  src = args.fetchurl {
+    url = http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE5.tar.bz2;
+    sha256 = "1m4ccpjw30q9vwsycmgg9dmhly0mpznvxrch6f7dxgfzpjp26l7w";
+  };
 
-      configureFlags = ["--enable-ipv6"];
+  configureFlags = ["--enable-ipv6"];
 
-      meta = { 
-        description = "http-proxy";
-        homepage = "http://www.squid-cache.org";
-        license = "GPL2";
-      };
+  meta = {
+    description = "http-proxy";
+    homepage = "http://www.squid-cache.org";
+    license = "GPL2";
   };
-} ) args
+}