Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.

svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
parent 3c824666fd
commit ccc497f80d
18 changed files with 85 additions and 60 deletions
@@ -1,4 +1,8 @@
-{stdenv, fetchurl, zlibSupport ? false, zlib ? null, sslSupport ? false, openssl ? null, linkStatic ? false}:
+{stdenv, fetchurl
+  , zlibSupport ? false, zlib ? null
+  , sslSupport ? false, openssl ? null
+  , linkStatic ? false
+  , ...}:

 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;