From a194af141bb1efef15f2d66d272cd292ff26a24e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 17 Aug 2009 18:31:42 +0000
Subject: [PATCH] Fix GConf from Gnome 2.26

svn path=/nixpkgs/trunk/; revision=16751
---
 pkgs/desktops/gnome-2.26/default.nix          |  3 ++-
 pkgs/development/libraries/policy-kit/0.9.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/policy-kit/0.9.nix

diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix
index 54cfc74e6ef..c5240689d25 100644
--- a/pkgs/desktops/gnome-2.26/default.nix
+++ b/pkgs/desktops/gnome-2.26/default.nix
@@ -36,9 +36,10 @@ rec {
   };
   
   GConf = import ./platform/GConf {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policy_kit;
+    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat;
     inherit (pkgs.gtkLibs) glib gtk;
     inherit intltool ORBit2;
+    policy_kit = pkgs.policy_kit_0_9;
   };
 
   libgnomecanvas = import ./platform/libgnomecanvas {
diff --git a/pkgs/development/libraries/policy-kit/0.9.nix b/pkgs/development/libraries/policy-kit/0.9.nix
new file mode 100644
index 00000000000..1314371c564
--- /dev/null
+++ b/pkgs/development/libraries/policy-kit/0.9.nix
@@ -0,0 +1,16 @@
+args: with args;
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  name = "PolicyKit-0.9";
+  
+  src = fetchurl {
+    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7";
+  };
+  
+  buildInputs = [
+   pkgconfig expat intltool glib dbus dbus_glib pam gettext
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f16dd86f65..22fc662111d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3914,6 +3914,13 @@ let
     inherit (gtkLibs) glib;
   };
 
+  policy_kit_0_9 = import ../development/libraries/policy-kit/0.9.nix {
+    inherit stdenv fetchurl pkgconfig expat pam intltool gettext 
+      dbus_glib;
+    inherit (gtkLibs) glib;
+    dbus = dbus.libs;
+  };
+
   poppler = import ../development/libraries/poppler {
     inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
       pkgconfig;