* Updated kdeartwork.

svn path=/nixpkgs/branches/kde-4.7/; revision=28005

14 files changed, 54 insertions, 28 deletions

diff --git a/pkgs/desktops/kde-4.7/artwork/aurorae.nix b/pkgs/desktops/kde-4.7/artwork/aurorae.nix
index 183914bf231a8..c48cbad4e8472 100644
--- a/pkgs/desktops/kde-4.7/artwork/aurorae.nix
+++ b/pkgs/desktops/kde-4.7/artwork/aurorae.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/color-schemes.nix b/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
index 7d20acb3a81ef..ec0fabcea82b5 100644
--- a/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
+++ b/pkgs/desktops/kde-4.7/artwork/color-schemes.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
index 760acd0292838..6490e75aaa51d 100644
--- a/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
+++ b/pkgs/desktops/kde-4.7/artwork/desktop-themes.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/emoticons.nix b/pkgs/desktops/kde-4.7/artwork/emoticons.nix
index 05d40947a94ae..b5086efa4fffd 100644
--- a/pkgs/desktops/kde-4.7/artwork/emoticons.nix
+++ b/pkgs/desktops/kde-4.7/artwork/emoticons.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
index 17e0af4c86f2e..07103168c0ab0 100644
--- a/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
index ca7e65b9f39b4..422eba781d5e4 100644
--- a/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.7/artwork/kscreensaver.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix b/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
new file mode 100644
index 0000000000000..ebec090ef9e3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/artwork/kwin-styles.nix
@@ -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";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
index 8bd1f4011367d..fd084ebb69271 100644
--- a/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
+++ b/pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/phase-style.nix b/pkgs/desktops/kde-4.7/artwork/phase-style.nix
index c4295b668100c..c2876f2df2961 100644
--- a/pkgs/desktops/kde-4.7/artwork/phase-style.nix
+++ b/pkgs/desktops/kde-4.7/artwork/phase-style.nix
@@ -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";
diff --git a/pkgs/desktops/kde-4.7/artwork/sounds.nix b/pkgs/desktops/kde-4.7/artwork/sounds.nix
index e0824503281b4..7789c4f09c57a 100644
--- a/pkgs/desktops/kde-4.7/artwork/sounds.nix
+++ b/pkgs/desktops/kde-4.7/artwork/sounds.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
index e2cad0b717818..0543813a0eff5 100644
--- a/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/wallpapers.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
index b4354c10f8741..9579ceca74c1f 100644
--- a/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
+++ b/pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix
@@ -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 = {
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index f3e3dfa507182..e07a5d245907e 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -95,10 +95,9 @@ recurseIntoAttrs rec {
     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 @@ recurseIntoAttrs rec {
     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 @@ recurseIntoAttrs rec {
   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);
-  */
 
 }
diff --git a/pkgs/desktops/kde-4.7/libkexiv2.nix b/pkgs/desktops/kde-4.7/libkexiv2.nix
index 6719caef89932..0d74058457045 100644
--- a/pkgs/desktops/kde-4.7/libkexiv2.nix
+++ b/pkgs/desktops/kde-4.7/libkexiv2.nix
@@ -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";