Downgrade WebKit - probably enough to go with old libsoup. Libsoup mostly updated, but it seems to require fresher unstable gtk...

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

7 files changed, 73 insertions, 9 deletions

diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix
index 29dc0a5c6679b..56387d73150ed 100644
--- a/pkgs/desktops/gnome-2.26/default.nix
+++ b/pkgs/desktops/gnome-2.26/default.nix
@@ -47,6 +47,12 @@ rec {
     inherit (pkgs.gtkLibs) glib gtk pango atk;
     inherit intltool libart_lgpl libglade;
   };
+
+  # for git-head builds
+  gnome_common = import platform/gnome-common {
+    inherit (pkgs) stdenv fetchgit pkgconfig
+      autoconf automake libtool;
+  };
   
   gnome_mime_data = import ./platform/gnome-mime-data {
     inherit (pkgs) stdenv fetchurl;
@@ -130,10 +136,13 @@ rec {
     inherit GConf;
   };
 
+  # fails with a mysterious error on linking
+  # symbol not found although it is actually present
   libsoup_git_head = import ./desktop/libsoup/git-head.nix {
-    inherit (pkgs) stdenv fetchgit pkgconfig libxml2 gnutls libproxy sqlite curl;
-    inherit (pkgs.gtkLibs) glib;
-    inherit GConf;
+    inherit (pkgs) stdenv fetchgit pkgconfig libxml2 gnutls libproxy sqlite curl
+      automake autoconf libtool which;
+    glib = pkgs.gtkLibs216.glib_2_21;
+    inherit GConf gnome_common gtk_doc gnome_keyring;
   };
 
   libwnck = import ./desktop/libwnck {
diff --git a/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix b/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix
index 81fcc4ab7f4f4..52cc35e8b9c7f 100644
--- a/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix
+++ b/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchgit, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, glib, GConf}:
+{stdenv, fetchgit, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, glib, GConf
+  , autoconf, automake, libtool, which
+  , gnome_common, gtk_doc, gnome_keyring
+  }:
 
 stdenv.mkDerivation {
   name = "libsoup-2.27.git";
@@ -7,5 +10,11 @@ stdenv.mkDerivation {
     rev = "3d0441b3f0c402447306f53789a47abdc573f8f3";
     md5 = "22379acc77cb6a381bd0abf69ae75ca8";
   };
-  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf ];
+  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf 
+    automake autoconf libtool which gnome_common gtk_doc gnome_keyring
+    ];
+  preConfigure = ''
+    export ACLOCAL_FLAGS='-I ${pkgconfig}/share/aclocal -I ${gtk_doc}/share/aclocal -I ${libtool}/share/aclocal'
+    ./autogen.sh
+  '';
 }
diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-common/default.nix
new file mode 100644
index 0000000000000..f6cd1310c8f10
--- /dev/null
+++ b/pkgs/desktops/gnome-2.26/platform/gnome-common/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchgit, pkgconfig, autoconf, automake, libtool}:
+
+stdenv.mkDerivation {
+  name = "gnome-common-git";
+  src =  fetchgit {
+    url = git://git.gnome.org/gnome-common;
+    rev = "53ca82d81d93b52bc057d649247eb18549a86d55";
+    md5 = "a3e4c471c73af14d87fa753c2ee05f15";
+  };
+  buildInputs = [ pkgconfig automake autoconf libtool
+    ];
+  preConfigure = ''
+    ./autogen.sh
+  '';
+}
diff --git a/pkgs/development/libraries/gtk-libs/2.16/default.nix b/pkgs/development/libraries/gtk-libs/2.16/default.nix
index 89abc0e62086b..71444890e949e 100644
--- a/pkgs/development/libraries/gtk-libs/2.16/default.nix
+++ b/pkgs/development/libraries/gtk-libs/2.16/default.nix
@@ -3,6 +3,7 @@ args: with args;
 rec {
 
   glib = (import ./glib) args;
+  glib_2_21 = (import ./glib/2.21.4.nix) args;
 
   atk = (import ./atk) (args // { inherit glib; });
 
diff --git a/pkgs/development/libraries/gtk-libs/2.16/glib/2.21.4.nix b/pkgs/development/libraries/gtk-libs/2.16/glib/2.21.4.nix
new file mode 100644
index 0000000000000..86934bc94d155
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs/2.16/glib/2.21.4.nix
@@ -0,0 +1,27 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "glib-2.21.4";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/glib/2.21/${name}.tar.bz2";
+    sha256 = "b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d";
+  };
+  
+  buildInputs = [pkgconfig gettext perl];
+
+  meta = {
+    description = "GLib, a C library of programming buildings blocks";
+
+    longDescription = ''
+      GLib provides the core application building blocks for libraries
+      and applications written in C.  It provides the core object
+      system used in GNOME, the main loop implementation, and a large
+      set of utility functions for strings and common data structures.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 9fd1b24155185..b5a305ad4a041 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -27,7 +27,10 @@ rec {
     "--enable-web-sockets"
     # Fails the build..
     # "--enable-shared-workers"
-    "--enable-wml"
+    # Related to Slashdot.org crash
+    # fixed upstream, but fresh release requires 
+    # too many updates
+    #"--enable-wml"
     ];
 
   /* doConfigure should be specified separately */
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 3e1c2fb472ff1..099f9c0a96539 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,6 +1,6 @@
 rec {
-  advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47686.tar.bz2";
-  version = "r47686";
+  advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r47291.tar.bz2";
+  version = "r47291";
   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
-  hash = "1h1frvvp8hfv3q2drjnrpgadgin55p7nv8747kxxhdkj4gv9dzqg";
+  hash = "14rggsgpsaxfph1967hbwlz814d8zyzl6xwzl7a25f6zf1nwcjdk";
 }