From 56536b34985044b7735c8c4f9c3cd95ddf438bf0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 5 Mar 2011 07:28:50 +0000
Subject: [PATCH] Getting WebKit overrides less wrong so no libsoup 2.28 gets
 used

svn path=/nixpkgs/trunk/; revision=26166
---
 pkgs/top-level/all-packages.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48326f93673c..50118af04262 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4184,16 +4184,19 @@ let
 
   webkit = let p = applyGlobalOverrides (x : {
     libsoup = x.gnome28.libsoup_2_31;
+    gnome28 = x.gnome28 // {
+      libsoup = x.gnome28.libsoup_2_31;
+    };
   });
   in
-  (builderDefsPackage ../development/libraries/webkit {
-    inherit (p.gnome28) gtkdoc libsoup;
+  (p.builderDefsPackage ../development/libraries/webkit {
+    inherit (p.gnome28) gtkdoc;
     inherit (p.gtkLibs) gtk atk pango glib;
     inherit (p) freetype fontconfig gettext gperf curl
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool
       pkgconfig autoconf bison libproxy enchant
-      python ruby which flex geoclue;
+      python ruby which flex geoclue libsoup;
     inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
       gstPluginsGood;
     inherit (p.xlibs) libXt renderproto libXrender;