Author: eelco
Date: Fri Jul 29 16:09:55 2011
New Revision: 28005
URL: https://svn.nixos.org/websvn/nix/?rev=28005&sc=1
Log:
* Updated kdeartwork.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/aurorae.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/emoticons.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/phase-style.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/sounds.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkexiv2.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/aurorae.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/aurorae.nix Fri Jul
29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/aurorae.nix Fri Jul
29 16:09:55 2011 (r28005)
@@ -1,9 +1,9 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "aurorae-themes-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
meta = {
kde = {
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-color-schemes-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "Additional KDE color schemes";
kde = {
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-desktop-themes-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "Additional KDE desktop themes";
kde = {
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/emoticons.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/emoticons.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/emoticons.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-emotion-icons-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "Additional KDE emotion icons (smiles)";
kde = {
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-wallpapers-high-resolution-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "KDE wallpapers in high resolution";
kde = {
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,8 +1,11 @@
-{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon, xscreensaver, kde_workspace,
eigen, libkexiv2 }:
kde.package rec {
- buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen
];
+ buildInputs =
+ [ cmake automoc4 qt4 kdelibs phonon xscreensaver kde_workspace eigen
libkexiv2 ];
+
preConfigure = "cp -v ${./FindXscreensaver.cmake}
cmake/modules/FindXscreensaver.cmake";
+
meta = {
description = "KDE screensavers";
kde = {
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -0,0 +1,13 @@
+{ cmake, kde, qt4, automoc4, kdelibs, phonon, kde_workspace }:
+
+kde.package rec {
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon kde_workspace ];
+
+ meta = {
+ description = "Styles for KWin";
+ kde = {
+ name = "kwin-styles";
+ module = "kdeartwork";
+ };
+ };
+}
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,11 +1,12 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "nuvola-icon-theme-${kde.release}";
# Sources contain primary and kdeclassic as well but they're not installed
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "KDE nuvola icon theme";
kde = {
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/phase-style.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/phase-style.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/phase-style.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,11 +1,12 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-style-phase-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
- description = "KDE phase style. Clean classical look";
+ description = "Phase, a widget style for KDE";
kde = {
name = "styles";
module = "kdeartwork";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/sounds.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/sounds.nix Fri Jul
29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/sounds.nix Fri Jul
29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-sounds-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "New login/logout sounds";
kde = {
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-wallpapers-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "Additional KDE wallpapers";
kde = {
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
Fri Jul 29 16:05:25 2011 (r28004)
+++
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
Fri Jul 29 16:09:55 2011 (r28005)
@@ -1,9 +1,10 @@
-{ cmake, kde, automoc4, kdelibs }:
+{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
kde.package rec {
name = "kde-weather-wallpapers-${kde.release}";
- buildInputs = [ cmake automoc4 kdelibs ];
+ buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
+
meta = {
description = "Additional KDE wallpapers (weather)";
kde = {
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
16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 29
16:09:55 2011 (r28005)
@@ -95,10 +95,9 @@
kaccessible = callPackage ./accessibility/kaccessible.nix { };
};
- /*
kdeartwork = combinePkgs "kdeartwork" {
aurorae = callPackage ./artwork/aurorae.nix { };
- colorSchemes = callPackage ./artwork/color-schemes.nix { };
+ color_schemes = callPackage ./artwork/color-schemes.nix { };
desktop_themes = callPackage ./artwork/desktop-themes.nix { };
emoticons = callPackage ./artwork/emoticons.nix { };
high_resolution_wallpapers = callPackage
./artwork/high-resolution-wallpapers.nix { };
@@ -108,8 +107,10 @@
weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
phase_style = callPackage ./artwork/phase-style.nix { };
kscreensaver = callPackage ./artwork/kscreensaver.nix { };
+ kwin_styles = callPackage ./artwork/kwin-styles.nix { };
};
+ /*
kdeedu = callPackage ./edu { };
kdegraphics = callPackage ./graphics { };
kdenetwork = callPackage ./network { };
@@ -178,10 +179,10 @@
kdebindings = callPackage ./bindings { };
l10n = callPackage ./l10n { inherit release; };
+ */
# Make the split packages visible to `nix-env -q'.
misc = recurseIntoAttrs
(kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs
// kdeutils.pkgs // kdewebdev.pkgs);
- */
}
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkexiv2.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkexiv2.nix Fri Jul
29 16:05:25 2011 (r28004)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkexiv2.nix Fri Jul
29 16:09:55 2011 (r28005)
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, exiv2 }:
+{ automoc4, cmake, kde, kdelibs, qt4, exiv2, perl, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 perl phonon ];
meta = {
description = "Exiv2 support library";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
