From 9ea1a49aa230039d9aa8ec23ccdd1b363406baa8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Aug 2009 21:12:46 +0000
Subject: [PATCH] * PolicyKit -> policy-kit (suggested by Ludovic). * Oops,
 there already was a polkit package.  Mea culpa...

svn path=/nixpkgs/trunk/; revision=16721
---
 pkgs/desktops/gnome/default.nix                  |  2 +-
 .../{PolicyKit => policy-kit}/default.nix        |  4 +---
 pkgs/os-specific/linux/polkit/default.nix        | 16 ----------------
 pkgs/top-level/all-packages.nix                  | 10 ++--------
 4 files changed, 4 insertions(+), 28 deletions(-)
 rename pkgs/development/libraries/{PolicyKit => policy-kit}/default.nix (82%)
 delete mode 100644 pkgs/os-specific/linux/polkit/default.nix

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index ce856bdbe31..15d13887672 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -328,7 +328,7 @@ rec {
     buildInputs = [
       pkgconfig perl perlXMLParser GConf gnomedocutils
       gtk libgnome libgnomeui gettext libxslt intltool
-      policyKit dbus_glib
+      policy_kit dbus_glib
     ];
 
     configureFlags = "--disable-scrollkeeper";
diff --git a/pkgs/development/libraries/PolicyKit/default.nix b/pkgs/development/libraries/policy-kit/default.nix
similarity index 82%
rename from pkgs/development/libraries/PolicyKit/default.nix
rename to pkgs/development/libraries/policy-kit/default.nix
index 4e212cfc55b..a63bff1c6f9 100644
--- a/pkgs/development/libraries/PolicyKit/default.nix
+++ b/pkgs/development/libraries/policy-kit/default.nix
@@ -1,9 +1,7 @@
 { 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";
+  name = "policy-kit-0.92";
   
   src = fetchurl {
     url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz;
diff --git a/pkgs/os-specific/linux/polkit/default.nix b/pkgs/os-specific/linux/polkit/default.nix
deleted file mode 100644
index 1314371c564..00000000000
--- a/pkgs/os-specific/linux/polkit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-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 475598d280d..b378549dd7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3902,7 +3902,7 @@ let
     inherit (xlibs) libXi libSM libXmu libXext libX11;
   };
 
-  PolicyKit = import ../development/libraries/PolicyKit {
+  policy_kit = import ../development/libraries/policy-kit {
     inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext;
     inherit (gtkLibs) glib;
   };
@@ -5442,12 +5442,6 @@ let
     inherit lib;
   };
 
-  policyKit = import ../os-specific/linux/polkit {
-    inherit fetchurl stdenv pkgconfig intltool expat dbus dbus_glib pam;
-    inherit gettext;
-    inherit (gtkLibs) glib;
-  };
-
   powertop = import ../os-specific/linux/powertop {
     inherit fetchurl stdenv ncurses gettext;
   };
@@ -7616,7 +7610,7 @@ let
       gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
       libcm python dbus dbus_glib ncurses which libxml2Python
       iconnamingutils openssl hal samba fam libgcrypt libtasn1
-      xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit
+      xmlto docbook2x docbook_xsl intltool enchant isocodes policy_kit
       libproxy sqlite;
   });