* Move Phonon out of KDE.

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

5 files changed, 2 insertions, 56 deletions

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d09b4ae3f536b..c152a90d2b6e3 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -24,8 +24,6 @@ recurseIntoAttrs rec {
 
   qt4 = qt47;
 
-  phonon = null;
-
   kde = callPackage ./kde-package { inherit release; };
 
 ### SUPPORT
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index 9e9ac65c01679..c45b9ac98f809 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -2,7 +2,7 @@
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
 , xz, flex, bison, openexr, aspell, 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, hspell
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, phonon
 }:
 
 kde.package {
@@ -19,7 +19,7 @@ kde.package {
 # Split plugins from libs?
 
   propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
-    shared_desktop_ontologies ];
+    shared_desktop_ontologies phonon ];
 
   patches = [ ./polkit-install.patch ];
 
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index cbdd737331a39..d57878388fcda 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -38,10 +38,6 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
-  phonon = callPackage ./phonon.nix { };
-
-  phonon_backend_gstreamer = callPackage ./phonon-backend-gstreamer.nix { };
-
   #kipi_plugins = callPackage ./kipi-plugins { };
 
 ### LIBS
diff --git a/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix b/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
deleted file mode 100644
index 20e3d97b228fa..0000000000000
--- a/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }:
-
-let version = "4.5.1"; in
-
-stdenv.mkDerivation rec {
-  name = "phonon-backend-gstreamer-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2";
-    sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2";
-  };
-
-  buildInputs =
-    [ cmake pkgconfig phonon qt4 automoc4
-      gst_all.gstreamer gst_all.gstPluginsBase
-    ];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "GStreamer backend for Phonon";
-  };  
-}
diff --git a/pkgs/desktops/kde-4.7/phonon.nix b/pkgs/desktops/kde-4.7/phonon.nix
deleted file mode 100644
index edcccb7bf0cef..0000000000000
--- a/pkgs/desktops/kde-4.7/phonon.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ 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";
-  };  
-}