lol

tomahawk: Qt 5 infrastructure upgrade

+3 -4
+2 -4
pkgs/applications/audio/tomahawk/default.nix
··· 11 11 assert enableKDE -> kdelibs != null; 12 12 assert enableTelepathy -> telepathy_qt != null; 13 13 14 - let 15 - quazipQt4 = quazip.override { qt = qt4; }; 16 - in stdenv.mkDerivation rec { 14 + stdenv.mkDerivation rec { 17 15 name = "tomahawk-${version}"; 18 16 version = "0.8.4"; 19 17 ··· 29 27 30 28 buildInputs = [ 31 29 cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon 32 - qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp 30 + qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp 33 31 makeWrapper 34 32 ] ++ stdenv.lib.optional enableXMPP libjreen 35 33 ++ stdenv.lib.optional enableKDE kdelibs
+1
pkgs/top-level/all-packages.nix
··· 13310 13310 enableXMPP = config.tomahawk.enableXMPP or true; 13311 13311 enableKDE = config.tomahawk.enableKDE or false; 13312 13312 enableTelepathy = config.tomahawk.enableTelepathy or false; 13313 + quazip = qt5.quazip.override { qt = qt4; }; 13313 13314 }; 13314 13315 13315 13316 torchat = callPackage ../applications/networking/instant-messengers/torchat {