diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-03-31 03:52:10 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-31 03:54:59 +0200 |
commit | 9e054117297b25e99dfe3fa7b6d6b1aabb47712c (patch) | |
tree | c4a1e2d2456c54e370546b22dbfe30b7690e76b6 /pkgs/tomahawk | |
parent | 646686535535ee7a09cc13a2847dfbca9134c135 (diff) |
tumahawk: Switch to Qt5 by default.
This was changed in tomahawk-player/tomahawk@873c35a, so let's adapt accordingly and jump straight to Qt 5.4 instead of plain old 5.3. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/tomahawk')
-rw-r--r-- | pkgs/tomahawk/default.nix | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index c17a2d7b..91bdd037 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, vlc, qca2, qjson, qt5, qtkeychain, quazip, kf5_latest -, sparsehash, taglib, websocketpp, makeWrapper +, liblastfm, lucenepp, vlc_qt5, qca2, qjson, qt54, qtkeychain, quazip +, kf5_latest, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -11,8 +11,31 @@ assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs != null; assert enableTelepathy -> telepathy_qt != null; +with stdenv.lib; + let - quazipQt4 = quazip.override { qt = qt4; }; + useQT5 = pkg: pkg.override (attrs: { + ${if attrs ? qt4 then "qt4" else "qt"} = qt54.base; + }); + + libechonestQT5 = overrideDerivation ((useQT5 libechonest).override { + qjson = useQT5 qjson; + }) (drv: { + cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" ]; + }); + + atticaQT5 = overrideDerivation (useQT5 attica) (drv: { + buildInputs = (drv.buildInputs or []) ++ [ + kf5_latest.extra-cmake-modules + ]; + }); + + vlc = vlc_qt5.override { + ffmpeg = ffmpeg_2.override { + v4l_utils = v4l_utils.override { withQt4 = false; }; + }; + }; + in stdenv.mkDerivation rec { name = "tomahawk-${version}"; version = "0.9.0-git"; @@ -29,13 +52,12 @@ in stdenv.mkDerivation rec { "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" ]; - buildInputs = [ - cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp vlc - qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp - makeWrapper - ] ++ stdenv.lib.optional enableXMPP libjreen - ++ stdenv.lib.optional enableKDE kdelibs - ++ stdenv.lib.optional enableTelepathy telepathy_qt; + buildInputs = (map useQT5 [ qca2 liblastfm quazip qtkeychain qjson ]) ++ [ + libechonestQT5 atticaQT5 cmake pkgconfig boost gnutls lucenepp vlc + qt54.base sparsehash taglib websocketpp makeWrapper + ] ++ stdenv.lib.optional enableXMPP (useQT5 libjreen) + ++ stdenv.lib.optional enableKDE (useQT5 kdelibs) + ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt); enableParallelBuilding = true; |