Author: urkud
Date: Fri Aug 6 20:22:22 2010
New Revision: 23010
URL: https://svn.nixos.org/websvn/nix/?rev=23010&sc=1
Log:
polkit-qt-1: use kdePackage
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/default.nix Fri Aug 6
20:21:08 2010 (r23009)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/kde-package/default.nix Fri Aug 6
20:22:22 2010 (r23010)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix Fri Aug
6 20:21:08 2010 (r23009)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix Fri Aug
6 20:22:22 2010 (r23010)
@@ -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 ];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
