Added PolicyKit-qt support to KDE 4.3

svn path=/nixpkgs/trunk/; revision=17572

3 files changed, 24 insertions, 3 deletions

diff --git a/pkgs/desktops/kde-4.3/base-workspace/default.nix b/pkgs/desktops/kde-4.3/base-workspace/default.nix
index 464e72cf1df0..40ef0dcfed4a 100644
--- a/pkgs/desktops/kde-4.3/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.3/base-workspace/default.nix
@@ -2,7 +2,7 @@
 , qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings
 , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
 , lm_sensors, libxklavier, libusb, pthread_stubs, boost
-, automoc4, phonon, strigi, soprano, qimageblitz, akonadi
+, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
 }:
 
 stdenv.mkDerivation {
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
                   libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
-                  lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi ];
+                  lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ];
   meta = {
     description = "KDE Workspace";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index 7272ebcf0797..a5f7f9b8f61b 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -48,6 +48,11 @@ rec {
     inherit (pkgs) stdenv fetchurl lib cmake;
   };
   
+  polkit_qt = import ./support/polkit-qt {
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 policykit;
+    inherit automoc4;
+  };
+  
 ### LIBS
   kdelibs = import ./libs {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
@@ -66,7 +71,7 @@ rec {
     inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit;
     inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver;
     inherit kdelibs kdelibs_experimental kdepimlibs kdebindings;
-    inherit automoc4 phonon strigi soprano qimageblitz akonadi;
+    inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
   };
   
   kdebase = import ./base {
diff --git a/pkgs/desktops/kde-4.3/support/polkit-qt/default.nix b/pkgs/desktops/kde-4.3/support/polkit-qt/default.nix
new file mode 100644
index 000000000000..448ecf17bfb2
--- /dev/null
+++ b/pkgs/desktops/kde-4.3/support/polkit-qt/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4, policykit, automoc4, lib}:
+
+stdenv.mkDerivation {
+  name = "polkit-qt-0.9.2";
+  src = fetchurl {
+    url = mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-0.9.2.tar.bz2;
+    sha256 = "1knlnmv9qg2i6j03rfj0xc5m5hgxdmr5ir67wjn089lwgjy83chk";
+  };
+  includeAllQtDirs = true;
+  buildInputs = [ cmake qt4 policykit automoc4 ];
+  meta = {
+    description = "Qt PolicyKit bindings";
+    license = "LGPL";
+    maintainers = [ lib.maintainers.sander ];
+  };
+}