* Updated kdemultimedia.

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

pkgs/desktops/kde-4.7/default.nix

@@ -87,6 +87,8 @@ recurseIntoAttrs rec {
 
   kdegames = callPackage ./games.nix { };
   
+  kdemultimedia = callPackage ./multimedia.nix { };
+
   /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
@@ -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 { };
   

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";
+  };
+}

pkgs/desktops/kde-4.7/multimedia/default.nix

@@ -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";
-  };
-}