From 8b6edfe78da24cf3f08b9eea6c596d2c32ea45d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Aug 2012 08:34:59 -0400
Subject: [PATCH] polkit: Update to 0.105 and enable systemd (logind) support

There are even newer polkit releases, but they have a spidermonkey
dependency which I don't want to bother with right now.
---
 pkgs/development/libraries/polkit/default.nix | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index dd83d7dfd8f..88daab5ff92 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,29 +1,31 @@
 { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
-, gobjectIntrospection }:
+, gobjectIntrospection
+, useSystemd ? false, systemd ? null }:
 
 let
 
   system = "/var/run/current-system/sw";
-  
+
   foolVars = {
     LOCALSTATE = "/var";
     SYSCONF = "/etc";
     LIB = "${system}/lib";
     DATA = "${system}/share";
   };
-  
+
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.104";
+  name = "polkit-0.105";
 
   src = fetchurl {
-    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1yf7307svs8qk76qdlgww1bhgdcia5cm92n16xz7njhy73c162kb";
+    url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
+    sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g";
   };
 
   buildInputs =
-    [ pkgconfig glib expat pam intltool gobjectIntrospection ];
+    [ pkgconfig glib expat pam intltool gobjectIntrospection ]
+    ++ stdenv.lib.optional useSystemd systemd;
 
   configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
 
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
       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
@@ -56,7 +58,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
+    homepage = http://www.freedesktop.org/wiki/Software/polkit;
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
     platforms = platforms.linux;
     maintainers = [ maintainers.urkud ];