diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-09-07 11:42:12 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-09-07 11:42:12 +0200 |
commit | 88301b607309d4c3a11d780d654c560fb9e7e67f (patch) | |
tree | 590fdb944e991aa6932b5522e0194dbcfbc05238 /pkgs/tomahawk | |
parent | a83e63689051b3d64d4650cc36af2fb9940a47b8 (diff) |
pkgs/tomahawk: Fix build with qtkeychain
Let's use the new upstream qt5.qtkeychain attribute instead of overriding it on our own, introduced in: NixOS/nixpkgs@1187b00e5872c8b65919158f2f908efb29117649 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/tomahawk')
-rw-r--r-- | pkgs/tomahawk/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index f50b0674..8b39fd77 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, boost, gnutls -, libechonest, liblastfm, lucenepp, qt5, qtkeychain, kde5, sparsehash, taglib +, libechonest, liblastfm, lucenepp, qt5, kde5, sparsehash, taglib , websocketpp, ffmpeg_2, v4l_utils , enableXMPP ? true, libjreen ? null @@ -39,13 +39,6 @@ let cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" ]; }); - qtkeychainQT5 = overrideDerivation (useQT5 qtkeychain) (drv: { - cmakeFlags = (drv.cmakeFlags or []) ++ [ - "-DBUILD_WITH_QT4=OFF" - "-DQt5LinguistTools_DIR=${qt5.qttools}/lib/cmake/Qt5LinguistTools" - ]; - }); - vlc = qt5.vlc.override { ffmpeg = ffmpeg_2.override { v4l_utils = v4l_utils.override { withQt4 = false; }; @@ -71,10 +64,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = (with qt5; [ - attica ecm qca-qt5 qtbase qtsvg qttools qtwebkit qtx11extras + attica ecm qca-qt5 qtbase qtkeychain qtsvg qttools qtwebkit qtx11extras ]) ++ map useQT5 [ liblastfm qt5.quazip ] ++ [ - boost gnutls lucenepp sparsehash taglib vlc websocketpp - qtkeychainQT5 libechonestQT5 + boost gnutls lucenepp sparsehash taglib vlc websocketpp libechonestQT5 ] ++ stdenv.lib.optional enableXMPP (useQT5 libjreen) ++ stdenv.lib.optional enableKDE (useQT5 kdelibs) ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt); |