cantata: build with Qt 5.5

pkgs/applications/audio/cantata/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake
 , withQt4 ? false, qt4
-, withQt5 ? true, qt5
+, withQt5 ? true, qtbase, qtsvg, qttools
 
 # I'm unable to make KDE work here, crashes at runtime so I simply
 # make Qt4 the default until someone who wants KDE can figure it out.
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ cmake ]
     ++ stdenv.lib.optional withQt4 qt4
-    ++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ])
+    ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
     ++ stdenv.lib.optional withKDE4 kde4.kdelibs
     ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
     ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
@@ -91,6 +91,10 @@ stdenv.mkDerivation rec {
     "-DENABLE_UDISKS2=ON"
   ];
 
+  postInstall = ''
+    wrapQtProgram "$out/bin/cantata"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/cantata/;
     description = "A graphical client for MPD";

pkgs/top-level/all-packages.nix

@@ -999,7 +999,7 @@ let
 
   davix = callPackage ../tools/networking/davix { };
 
-  cantata = callPackage ../applications/audio/cantata { };
+  cantata = qt5Libs.callPackage ../applications/audio/cantata { };
 
   can-utils = callPackage ../os-specific/linux/can-utils { };