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

3 files changed, 38 insertions, 5 deletions

diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix
index 29dc0a5c667..56387d73150 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 81fcc4ab7f4..52cc35e8b9c 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 00000000000..f6cd1310c8f
--- /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
+  '';
+}