* Updated kdemultimedia.

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

3 files changed, 20 insertions, 18 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 83af1eaeb4d61..cbdd737331a39 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -86,6 +86,8 @@ recurseIntoAttrs rec {
   kdeadmin = callPackage ./admin.nix { };
 
   kdegames = callPackage ./games.nix { };
+  
+  kdemultimedia = callPackage ./multimedia.nix { };
 
   /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
@@ -116,7 +118,6 @@ recurseIntoAttrs rec {
   kdeedu = callPackage ./edu { };
   kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
-  kdemultimedia = callPackage ./multimedia { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
   
diff --git a/pkgs/desktops/kde-4.7/multimedia.nix b/pkgs/desktops/kde-4.7/multimedia.nix
new file mode 100644
index 0000000000000..f731808d21ea2
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/multimedia.nix
@@ -0,0 +1,18 @@
+{ kde, cmake, perl, qt4, phonon, alsaLib, libvorbis, taglib, flac
+, cdparanoia, lame, kdelibs, automoc4, ffmpeg, libmusicbrainz3, libtunepimp }:
+
+kde.package {
+
+  buildInputs =
+    # Note: kdemultimedia can use xine-lib, but it doesn't seem useful
+    # without the Phonon Xine backend.
+    [ cmake kdelibs qt4 automoc4 phonon cdparanoia taglib libvorbis
+      libmusicbrainz3 libtunepimp ffmpeg flac lame
+    ];
+
+  meta = {
+    description = "KDE multimedia programs such as a movie player and volume utility";
+    license = "GPL";
+    kde.name = "kdemultimedia";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/multimedia/default.nix b/pkgs/desktops/kde-4.7/multimedia/default.nix
deleted file mode 100644
index e18257e02a1e8..0000000000000
--- a/pkgs/desktops/kde-4.7/multimedia/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
-cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }:
-
-kde.package {
-
-  buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
-    cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ];
-
-  meta = {
-    description = "KDE Multimedia";
-    longDescription = ''
-      Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
-    '';
-    license = "GPL";
-    kde.name = "kdemultimedia";
-  };
-}