diff options
| -rw-r--r-- | pkgs/tomahawk/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index 9bf97a32..bf018815 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, vlc_qt5, qca2, qjson, qt54, qtkeychain, quazip +, liblastfm, lucenepp, vlc_qt5, qca2, qt54, qtkeychain, quazip , kf5_latest, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils , enableXMPP ? true, libjreen ? null @@ -19,7 +19,7 @@ let }); libechonestQT5 = overrideDerivation ((useQT5 libechonest).override { - qjson = useQT5 qjson; + qjson = null; }) (drv: { cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" ]; }); @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" ]; - buildInputs = (map useQT5 [ qca2 liblastfm quazip qtkeychain qjson ]) ++ [ + buildInputs = (map useQT5 [ qca2 liblastfm quazip qtkeychain ]) ++ [ libechonestQT5 kf5_latest.attica cmake pkgconfig boost gnutls lucenepp vlc qt54.base sparsehash taglib websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP (useQT5 libjreen) |