From ede16e5dc58cadc3f77cc0f0f4657217a4d5f8eb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Aug 2010 20:22:22 +0000
Subject: [PATCH] polkit-qt-1: use kdePackage

svn path=/nixpkgs/trunk/; revision=23010
---
 pkgs/desktops/kde-4.5/kde-package/default.nix    |  6 +++---
 .../kde-4.5/support/polkit-qt-1/default.nix      | 16 +++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix
index 614c31561fd..d1b58b280c6 100644
--- a/pkgs/desktops/kde-4.5/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
-{ pn, v, stable ? true, sha256 }: args:
+{ pn, v, stable ? true, sha256, subdir ? null }: args:
 stdenv.mkDerivation ({
   name = "${pn}-${v}";
   src = fetchurl {
-    url = "mirror://kde/" + (if stable then "" else "un")
-      + "stable/${v}/src/${pn}-${v}.tar.bz2";
+    url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
+      (if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
     inherit sha256;
   };
   meta = {
diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
index a109c2b6b09..dfdb83293a2 100644
--- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
+++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
-
-stdenv.mkDerivation rec {
-  name = "polkit-qt-1-0.96.1";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
-    sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
-  };
+{ kdePackage, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
 
+kdePackage {
+  pn = "polkit-qt-1";
+  v = "0.96.1";
+  subdir = "apps/KDE4.x/admin";
+  sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+} {
   buildInputs = [ cmake qt4 automoc4 ];
   propagatedBuildInputs = [ polkit glib ];
 }