* Add kde-runtime. It requires a newer Phonon than provided by Qt, so

  add that as well.  Maybe we should build Qt without Phonon to remove
  potential interference...

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

4 files changed, 56 insertions, 5 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index d2a990d256c9b..1dfc88d282174 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -24,8 +24,6 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
-  phonon = null;
-
   kde = callPackage ./kde-package { inherit release; stable = false; };
 
 ### SUPPORT
@@ -40,6 +38,8 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
+  phonon = callPackage ./phonon.nix { };
+
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
@@ -54,6 +54,8 @@ recurseIntoAttrs rec {
 
   kde_workspace = callPackage ./workspace.nix { };
 
+  kde_runtime = callPackage ./runtime.nix { };
+
   # Backwards compatibility.
   kdebase_workspace = kde_workspace;
 
diff --git a/pkgs/desktops/kde-4.7/phonon.nix b/pkgs/desktops/kde-4.7/phonon.nix
new file mode 100644
index 0000000000000..edcccb7bf0cef
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/phonon.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "phonon-4.5.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2";
+    sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36";
+  };
+
+  buildInputs = [ cmake automoc4 qt4 ];
+
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs'
+      substituteInPlace designer/CMakeLists.txt \
+        --replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
+    '';
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "Multimedia API for Qt";
+    license = "LGPLv2";
+  };  
+}
diff --git a/pkgs/desktops/kde-4.7/runtime.nix b/pkgs/desktops/kde-4.7/runtime.nix
new file mode 100644
index 0000000000000..3674e4e33577c
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/runtime.nix
@@ -0,0 +1,22 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano, shared_desktop_ontologies
+, bzip2, xz, shared_mime_info, libssh, exiv2, attica, phonon, libcanberra
+}:
+
+kde.package {
+
+  buildInputs =
+    [ phonon cmake kdelibs qt4 automoc4 strigi soprano
+      shared_desktop_ontologies bzip2 xz shared_mime_info libssh
+      exiv2 attica
+      (libcanberra.override { gtk = null; })
+    ];
+
+  # Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
+  NIX_LDFLAGS = "-lutil";
+    
+  meta = {
+    license = "LGPL";
+    kde.name = "kde-runtime";
+  };
+
+}
diff --git a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
index 703dfe0f0cf01..fb7a063fd8ffc 100644
--- a/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
@@ -1,14 +1,15 @@
-{kde, cmake}:
+{ kde, cmake }:
 
 kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "4c2881683f8d66114ac79a9573498e627146aa647574efb9b8f89f837e1d7b06";
+  outputHash = "4736af7eef8c0defa8f5ae997ac85e0a19c4d1af9a9e963b2434317c5408ab86";
 
   buildInputs = [ cmake ];
+  
   meta = {
     description = "KDE Oxygen theme icons";
-    longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
+    longDescription = "Icons for KDE's default theme";
     license = "GPL";
     kde.name = "oxygen-icons";
   };