public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tomahawk: Qt 5 infrastructure upgrade

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 23:29:41 -06:00
parent 54bcdcc0a7
commit 5810f0e7ed
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/tomahawk/default.nix
View File

@ -11,9 +11,7 @@ assert enableXMPP -> libjreen != null;
assert enableKDE -> kdelibs != null;
assert enableTelepathy -> telepathy_qt != null;
let
quazipQt4 = quazip.override { qt = qt4; };
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "tomahawk-${version}";
version = "0.8.4";
@ -29,7 +27,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon
qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp
qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
++ stdenv.lib.optional enableKDE kdelibs

1
pkgs/top-level/all-packages.nix
View File

@ -13310,6 +13310,7 @@ let
enableXMPP = config.tomahawk.enableXMPP or true;
enableKDE = config.tomahawk.enableKDE or false;
enableTelepathy = config.tomahawk.enableTelepathy or false;
quazip = qt5.quazip.override { qt = qt4; };
};
torchat = callPackage ../applications/networking/instant-messengers/torchat {