Author: eelco
Date: Thu Jul 7 20:47:38 2011
New Revision: 27643
URL: https://svn.nixos.org/websvn/nix/?rev=27643&sc=1
Log:
* Move Attica and polkit-qt-1 out of desktops/kde (since they're not
part of a KDE release).
Added:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/attica/
- copied from r27617, nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
- copied, changed from r27618,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
(from r27618,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix)
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
Thu Jul 7 11:28:53 2011 (r27618, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit-qt-1/default.nix
Thu Jul 7 20:47:38 2011 (r27643)
@@ -1,17 +1,18 @@
-{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
-kde.package rec {
- buildInputs = [ cmake qt4 automoc4 ];
- propagatedBuildInputs = [ polkit glib ];
+stdenv.mkDerivation rec {
+ name = "polkit-qt-1-0.99.0";
src = fetchurl {
- url = with meta.kde;
- "mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2";
- sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+ url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
+ sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r";
};
- meta.kde = {
- name = "polkit-qt-1";
- version = "0.96.1";
+ buildInputs = [ cmake qt4 automoc4 ];
+
+ propagatedBuildInputs = [ polkit glib ];
+
+ meta = {
+ description = "A Qt wrapper around PolKit";
};
}
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 7
20:03:36 2011 (r27642)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 7
20:47:38 2011 (r27643)
@@ -2906,6 +2906,8 @@
aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
+ attica = callPackage ../development/libraries/attica { };
+
attr = callPackage ../development/libraries/attr { };
aubio = callPackage ../development/libraries/aubio { };
@@ -4120,6 +4122,8 @@
polkit = callPackage ../development/libraries/polkit { };
+ polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { };
+
policykit = callPackage ../development/libraries/policykit { };
poppler = callPackage ../development/libraries/poppler {
@@ -7618,6 +7622,10 @@
callPackage = newScope pkgs.kde46;
};
+ kde47 = callPackage ../desktops/kde-4.7 {
+ callPackage = newScope pkgs.kde47;
+ };
+
redshift = callPackage ../applications/misc/redshift {
inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
xf86vidmodeproto;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
