Author: eelco
Date: Fri Jul 29 12:41:31 2011
New Revision: 27998
URL: https://svn.nixos.org/websvn/nix/?rev=27998&sc=1
Log:
* Updated kdetoys.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/amor.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/kteatime.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/ktux.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
12:31:07 2011 (r27997)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
12:41:31 2011 (r27998)
@@ -139,13 +139,13 @@
umbrello = callPackage ./sdk/umbrello.nix { };
okteta = callPackage ./utils/okteta.nix { };
};
-
+ */
+
kdetoys = combinePkgs "kdetoys" {
amor = callPackage ./toys/amor.nix { };
kteatime = callPackage ./toys/kteatime.nix { };
ktux = callPackage ./toys/ktux.nix { };
};
- */
kdeutils = combinePkgs "kdeutils" {
ark = callPackage ./utils/ark.nix { };
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/amor.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/amor.nix Fri Jul
29 12:31:07 2011 (r27997)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/amor.nix Fri Jul
29 12:41:31 2011 (r27998)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = {
description = "KDE creature for your desktop";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/kteatime.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/kteatime.nix Fri Jul
29 12:31:07 2011 (r27997)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/kteatime.nix Fri Jul
29 12:41:31 2011 (r27998)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = {
description = "KDE utility for making a fine cup of tea";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/ktux.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/ktux.nix Fri Jul
29 12:31:07 2011 (r27997)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/toys/ktux.nix Fri Jul
29 12:41:31 2011 (r27998)
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, kdebase_workspace }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, kde_workspace }:
kde.package {
- buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_workspace ];
meta = {
description = "Tux Screen Saver";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
