4 files changed, 57 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ConsoleKit/default.nix b/pkgs/development/libraries/ConsoleKit/default.nix
index d84d12546af66..613708c0223ca 100644
--- a/pkgs/development/libraries/ConsoleKit/default.nix
+++ b/pkgs/development/libraries/ConsoleKit/default.nix
@@ -1,10 +1,17 @@
 {stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11}:
 
-stdenv.mkDerivation {
-  name = "ConsoleKit-0.3.0";
+stdenv.mkDerivation rec {
+  name = "ConsoleKit-0.3.1";
+  
   src = fetchurl {
-    url = http://people.freedesktop.org/~mccann/dist/ConsoleKit-0.3.0.tar.bz2;
-    md5 = "43b02a52212330b54cfb34c4044d9ce0";    
+    url = "http://www.freedesktop.org/software/ConsoleKit/dist/${name}.tar.bz2";
+    sha256 = "0b834ly6l8l76awr2pn2xz3ic6ilhfif4h3nsi96ffa91n09ydk0";
   };
+  
   buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 ];
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/ConsoleKit;
+    description = "A framework for defining and tracking users, login sessions, and seats";
+  };
 }
diff --git a/pkgs/development/libraries/PolicyKit/default.nix b/pkgs/development/libraries/PolicyKit/default.nix
new file mode 100644
index 0000000000000..4e212cfc55bcf
--- /dev/null
+++ b/pkgs/development/libraries/PolicyKit/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }:
+
+stdenv.mkDerivation rec {
+  # ... or should we name this package "polkit"?  Upstream doesn't
+  # seem to know either...
+  name = "PolicyKit-0.92";
+  
+  src = fetchurl {
+    url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz;
+    sha256 = "18x4xp4m14fm4aayra4njh82g2jzf6ccln40yybmhxqpb5a3nii8";
+  };
+  
+  buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext ];
+
+  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";
+  };
+}
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
new file mode 100644
index 0000000000000..3811d7ea1f165
--- /dev/null
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "eggdbus-0.5";
+  
+  src = fetchurl {
+    url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "0g1s9nzfyjyhnmv4hzll3izayh4c4pjy3i51ihwgkz3wmd1xaq9j";
+  };
+  
+  buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
+
+  meta = {
+    homepage = http://hal.freedesktop.org/releases/;
+    description = "D-Bus bindings for GObject";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 813e9b9cb7fb6..6440084767adc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2445,6 +2445,11 @@ let
     qt = if getPkgConfig "doxygen" "qt4" true then qt4 else null;
   };
 
+  eggdbus = import ../development/tools/misc/eggdbus {
+    inherit stdenv fetchurl pkgconfig dbus dbus_glib;
+    inherit (gtkLibs) glib;
+  };
+
   elfutils = import ../development/tools/misc/elfutils {
     inherit fetchurl stdenv m4;
   };
@@ -3894,6 +3899,11 @@ let
     inherit (xlibs) libXi libSM libXmu libXext libX11;
   };
 
+  PolicyKit = import ../development/libraries/PolicyKit {
+    inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext;
+    inherit (gtkLibs) glib;
+  };
+
   poppler = import ../development/libraries/poppler {
     inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
       pkgconfig;