cantata: build with Qt 5.5

+7 -3
+6 -2
pkgs/applications/audio/cantata/default.nix
··· 1 1 { stdenv, fetchurl, cmake 2 2 , withQt4 ? false, qt4 3 - , withQt5 ? true, qt5 3 + , withQt5 ? true, qtbase, qtsvg, qttools 4 4 5 5 # I'm unable to make KDE work here, crashes at runtime so I simply 6 6 # make Qt4 the default until someone who wants KDE can figure it out. ··· 57 57 buildInputs = 58 58 [ cmake ] 59 59 ++ stdenv.lib.optional withQt4 qt4 60 - ++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ]) 60 + ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] 61 61 ++ stdenv.lib.optional withKDE4 kde4.kdelibs 62 62 ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] 63 63 ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ··· 90 90 "-DENABLE_HTTPS_SUPPORT=ON" 91 91 "-DENABLE_UDISKS2=ON" 92 92 ]; 93 + 94 + postInstall = '' 95 + wrapQtProgram "$out/bin/cantata" 96 + ''; 93 97 94 98 meta = with stdenv.lib; { 95 99 homepage = http://code.google.com/p/cantata/;
+1 -1
pkgs/top-level/all-packages.nix
··· 999 999 1000 1000 davix = callPackage ../tools/networking/davix { }; 1001 1001 1002 - cantata = callPackage ../applications/audio/cantata { }; 1002 + cantata = qt5Libs.callPackage ../applications/audio/cantata { }; 1003 1003 1004 1004 can-utils = callPackage ../os-specific/linux/can-utils { }; 1005 1005