From 6ce3b9a8068dc8ec83a580168e3690bd15c92145 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 18:16:03 +0000
Subject: [PATCH] * PolKit updated to 0.101.

svn path=/nixpkgs/branches/kde-4.7/; revision=27636
---
 .../libraries/policykit/default.nix           |  2 +-
 pkgs/development/libraries/polkit/default.nix | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix
index 87e06e9a57a4..41b6839f0c23 100644
--- a/pkgs/development/libraries/policykit/default.nix
+++ b/pkgs/development/libraries/policykit/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
   
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
-    description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
+    description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)";
   };
 }
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 35a1a37e39ff..709b2a46ab08 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,38 +1,44 @@
-{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext,
-  gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
+, gobjectIntrospection }:
 
 let
-  system="/var/run/current-system/sw";
+
+  system = "/var/run/current-system/sw";
+  
   foolVars = {
     LOCALSTATE = "/var";
     SYSCONF = "/etc";
-    LIBEXEC = "${system}/libexec/polkit-1";
     LIB = "${system}/lib";
     DATA = "${system}/share";
   };
+  
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.99";
+  name = "polkit-0.101";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0gsqnc5x6angma7paw0hnl5cagqimsj5f022a5vzc8n8dv1cf4pn";
+    sha256 = "06wz7zvmh89h2m4k8nik745fp1i9q92h5sgarpbj7kjg1rv6azwj";
   };
 
-  buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext
-    gobjectIntrospection ];
+  buildInputs =
+    [ pkgconfig glib expat pam intltool gobjectIntrospection ];
 
-  preConfigure=''
-    configureFlags="--libexecdir=$out/libexec/polkit-1"
-  '';
+  configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
 
   # Ugly hack to overwrite hardcoded directories
   # TODO: investigate a proper patch which will be accepted upstream
   CFLAGS = stdenv.lib.concatStringsSep " "
     ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'')
-    (builtins.attrNames foolVars) );
+        (builtins.attrNames foolVars) );
 
+  makeFlags =
+    ''
+      INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
+      INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0
+    '';
+        
   postInstall =
     ''
       # Allow some files with paranoid permissions to be stripped in