From f8abffe6b1a9e05ec72b7145d7d2220817b41a0a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Sep 2009 11:21:58 +0000
Subject: [PATCH] Give up and use older GConf

svn path=/nixpkgs/trunk/; revision=17540
---
 pkgs/desktops/gnome-2.28/platform/GConf/default.nix |  7 ++++---
 pkgs/top-level/all-packages.nix                     | 10 +++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix b/pkgs/desktops/gnome-2.28/platform/GConf/default.nix
index aad6adec94b2..661a20e2b659 100644
--- a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2.28/platform/GConf/default.nix
@@ -2,14 +2,15 @@
 , expat, policykit, intltool, dbus_libs}:
 
 stdenv.mkDerivation {
-  name = "GConf-2.28.0";
+  name = "GConf-2.26.2";
   src = fetchurl {
-    url = mirror://gnome/sources/GConf/2.28/GConf-2.28.0.tar.bz2;
-    sha256 = "1j3ah0f71yv4di3fvv1aahcjvqfwsxw2m71ljbjq0apv5gzdqmyh";
+    url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2;
+    sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki";
   };
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${dbus_glib}/include/dbus-1.0 -I${policykit}/include/PolicyKit -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_libs}/include/dbus-1.0 -I${dbus_libs}/lib/dbus-1.0/include"
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(glib-config --libs)"
   '';
 
   buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffcb2a9b1d82..4e54a7a71053 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3077,6 +3077,11 @@ let
     inherit (gtkLibs) glib;
   };
 
+  dbus_glib_gtk_218 = import ../development/libraries/dbus-glib {
+    inherit fetchurl stdenv pkgconfig gettext dbus expat;
+    inherit (gtkLibs218) glib;
+  };
+
   dclib = import ../development/libraries/dclib {
     inherit fetchurl stdenv libxml2 openssl bzip2;
   };
@@ -8086,7 +8091,10 @@ let
 
   gnome26 = import ../desktops/gnome-2.26 pkgs;
 
-  gnome28 = import ../desktops/gnome-2.28 (pkgs// {gtkLibs = gtkLibs218;});
+  gnome28 = import ../desktops/gnome-2.28 (pkgs// {
+    gtkLibs = gtkLibs218;
+    dbus_glib = dbus_glib_gtk_218;
+  });
 
   kde3 = {