* Pass Phonon as a dependency where needed.

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

10 files changed, 21 insertions, 22 deletions

diff --git a/pkgs/desktops/kde-4.7/baseapps.nix b/pkgs/desktops/kde-4.7/baseapps.nix
index e32b1f6fcc256..61f52cc74543e 100644
--- a/pkgs/desktops/kde-4.7/baseapps.nix
+++ b/pkgs/desktops/kde-4.7/baseapps.nix
@@ -1,12 +1,12 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, soprano
-, shared_desktop_ontologies, glib
+, shared_desktop_ontologies, glib, phonon
 }:
 
 kde.package {
 
   buildInputs =
     [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
-      glib
+      glib phonon
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix
index f349b2f7920af..26687c709a1a9 100644
--- a/pkgs/desktops/kde-4.7/gwenview.nix
+++ b/pkgs/desktops/kde-4.7/gwenview.nix
@@ -1,11 +1,12 @@
 { kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
-, shared_desktop_ontologies, kde_baseapps, libkipi }:
+, shared_desktop_ontologies, kde_baseapps, libkipi, phonon
+}:
 
 kde.package {
 
   buildInputs =
     [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
-      kde_baseapps libkipi
+      kde_baseapps libkipi phonon
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/kate.nix b/pkgs/desktops/kde-4.7/kate.nix
index 6dfde7f76e1c1..f5b445791b152 100644
--- a/pkgs/desktops/kde-4.7/kate.nix
+++ b/pkgs/desktops/kde-4.7/kate.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl }:
+{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl phonon ];
 
   meta = {
     description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
diff --git a/pkgs/desktops/kde-4.7/kcolorchooser.nix b/pkgs/desktops/kde-4.7/kcolorchooser.nix
index 929d0f09de6a7..0b9f2dcba74c2 100644
--- a/pkgs/desktops/kde-4.7/kcolorchooser.nix
+++ b/pkgs/desktops/kde-4.7/kcolorchooser.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "KDE color chooser utility";
diff --git a/pkgs/desktops/kde-4.7/konsole.nix b/pkgs/desktops/kde-4.7/konsole.nix
index 4b07cf1e0e74f..4965921fcc6fa 100644
--- a/pkgs/desktops/kde-4.7/konsole.nix
+++ b/pkgs/desktops/kde-4.7/konsole.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "Konsole, the KDE terminal emulator";
diff --git a/pkgs/desktops/kde-4.7/ksnapshot.nix b/pkgs/desktops/kde-4.7/ksnapshot.nix
index 1f5af060ba45b..6eadbd88c65bc 100644
--- a/pkgs/desktops/kde-4.7/ksnapshot.nix
+++ b/pkgs/desktops/kde-4.7/ksnapshot.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libkipi }:
+{ automoc4, cmake, kde, kdelibs, qt4, libkipi, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi phonon ];
 
   meta = {
     description = "KDE screenshot utility";
diff --git a/pkgs/desktops/kde-4.7/libkipi.nix b/pkgs/desktops/kde-4.7/libkipi.nix
index cb1e556af9879..bb80755f9f2fc 100644
--- a/pkgs/desktops/kde-4.7/libkipi.nix
+++ b/pkgs/desktops/kde-4.7/libkipi.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
 
   meta = {
     description = "Interface library to kipi-plugins";
diff --git a/pkgs/desktops/kde-4.7/libs/default.nix b/pkgs/desktops/kde-4.7/libs/default.nix
index b8b0b3d73672e..7f246e61f97e1 100644
--- a/pkgs/desktops/kde-4.7/libs/default.nix
+++ b/pkgs/desktops/kde-4.7/libs/default.nix
@@ -3,7 +3,7 @@
 , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq
+, getopt, udev, herqq, phonon, gettext
 }:
 
 kde.package {
@@ -12,7 +12,7 @@ kde.package {
     [ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt
       giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre
       perl perl polkit_qt_1 qca2 qt4 shared_desktop_ontologies
-      shared_mime_info soprano strigi udev xz 
+      shared_mime_info soprano strigi udev xz phonon libxml2
     ];
     
   # TODO: make sonnet plugins (dictionaries) really work.
@@ -20,9 +20,6 @@ kde.package {
   # Let kdelibs find openexr
   # Split plugins from libs?
 
-  #propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
-  #  shared_desktop_ontologies ];
-
   patches = [ ./polkit-install.patch ];
 
   # cmake fails to find acl.h because of C++-style comment
diff --git a/pkgs/desktops/kde-4.7/okular.nix b/pkgs/desktops/kde-4.7/okular.nix
index ef5069cd68c27..1b9ab5f2706ba 100644
--- a/pkgs/desktops/kde-4.7/okular.nix
+++ b/pkgs/desktops/kde-4.7/okular.nix
@@ -1,11 +1,11 @@
 { automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
-, popplerQt4, qca2, qimageblitz, qt4 }:
+, popplerQt4, qca2, qimageblitz, qt4, phonon }:
 
 kde.package {
 
   buildInputs =
     [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
-      qca2 qimageblitz qt4
+      qca2 qimageblitz qt4 phonon
     ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index e78cbe756095f..e248f2a38e1ce 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,6 +1,7 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
 , libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
+, phonon
 }:
 
 kde.package {
@@ -11,7 +12,7 @@ kde.package {
       xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
       xorg.libpthreadstubs
       soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
-      libusb python libqalculate akonadi perl consolekit
+      libusb python libqalculate akonadi perl consolekit phonon
     ];
 
   # Workaround for undefined reference to ‘dlsym’ in