diff options
Diffstat (limited to 'pkgs/tomahawk/default.nix')
| -rw-r--r-- | pkgs/tomahawk/default.nix | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index 2d7ed2e2..db13733f 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, attica, boost, gnutls -, libechonest, liblastfm, lucenepp, vlc_qt5, qca2, qt54, qtkeychain, quazip +, libechonest, liblastfm, lucenepp, vlc_qt5, qca-qt5, qt5, qtkeychain, quazip , kf5_latest, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils , enableXMPP ? true, libjreen ? null @@ -16,7 +16,7 @@ with stdenv.lib; let useQT5 = pkg: let qt5variant = pkg.override (attrs: { - ${if attrs ? qt4 then "qt4" else "qt"} = qt54.base; + ${if attrs ? qt4 then "qt4" else "qt"} = qt5.qtbase; }); in qt5variant.overrideDerivation (drv: { postInstall = (drv.postInstall or "") + '' @@ -33,14 +33,6 @@ let ''; }); - qcaQT5 = overrideDerivation (useQT5 qca2) (drv: rec { - name = "qca-qt5-2.1.0.3"; - src = fetchurl { - url = "mirror://kde/stable/qca-qt5/2.1.0.3/src/${name}.tar.xz"; - sha256 = "1yc9s88q6gzb1jjd34f9h28dnhjb1dnx6wlasf47by4gd9lp00db"; - }; - }); - libechonestQT5 = overrideDerivation ((useQT5 libechonest).override { qjson = null; }) (drv: { @@ -50,7 +42,7 @@ let qtkeychainQT5 = overrideDerivation (useQT5 qtkeychain) (drv: { cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" - "-DQt5LinguistTools_DIR=${qt54.tools}/lib/cmake/Qt5LinguistTools" + "-DQt5LinguistTools_DIR=${qt5.qttools}/lib/cmake/Qt5LinguistTools" ]; }); @@ -67,8 +59,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "tomahawk-player"; repo = "tomahawk"; - rev = "1056621a87448b7ba1a8539f0735d655b29a09e8"; - sha256 = "00ijbnnk0x6912ny4cwna0s68j44f5b8k9sgv0vlm5cqi5a6cpgj"; + rev = "d4c3f24232f09e352868cf8592efcfb1f228b2db"; + sha256 = "0hn7fa2a17i76ai657h6l9f4yp3sz75xpv3yparky9kir6zjbrrz"; }; cmakeFlags = [ @@ -77,9 +69,10 @@ in stdenv.mkDerivation rec { ]; buildInputs = (map useQT5 [ liblastfm quazip ]) ++ [ - qcaQT5 qtkeychainQT5 libechonestQT5 kf5_latest.attica cmake pkgconfig boost - gnutls lucenepp vlc qt54.base qt54.svg qt54.tools qt54.x11extras sparsehash - taglib websocketpp makeWrapper + qca-qt5 qtkeychainQT5 libechonestQT5 kf5_latest.attica cmake pkgconfig + kf5_latest.extra-cmake-modules boost gnutls lucenepp vlc qt5.qtbase + qt5.qtsvg qt5.qttools qt5.qtwebkit qt5.qtx11extras sparsehash taglib + websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP (useQT5 libjreen) ++ stdenv.lib.optional enableKDE (useQT5 kdelibs) ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt); |