about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-31 15:17:02 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-03-31 15:17:02 +0200
commit8274051c8ed9008cf04f449fd5c92dacca558458 (patch)
tree6895167cb1d242bee5ea6b44ca0c15984e8161dd /pkgs
parentfb8d28f8766046a8a1792305f42d7c8e73f61bae (diff)
tomahawk: Add Qt5 tools to qtkeychain dependency.
Building qtkeychain with Qt5 requires Qt5LinguistTools.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tomahawk/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix
index bf018815..1ff83458 100644
--- a/pkgs/tomahawk/default.nix
+++ b/pkgs/tomahawk/default.nix
@@ -24,6 +24,13 @@ let
     cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DBUILD_WITH_QT4=OFF" ];
   });
 
+  qtkeychainQT5 = overrideDerivation (useQT5 qtkeychain) (drv: {
+    cmakeFlags = (drv.cmakeFlags or []) ++ [
+      "-DBUILD_WITH_QT4=OFF"
+      "-DQt5LinguistTools_DIR=${qt54.tools}/lib/cmake/Qt5LinguistTools"
+    ];
+  });
+
   vlc = vlc_qt5.override {
     ffmpeg = ffmpeg_2.override {
       v4l_utils = v4l_utils.override { withQt4 = false; };
@@ -46,9 +53,9 @@ in stdenv.mkDerivation rec {
     "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
   ];
 
-  buildInputs = (map useQT5 [ qca2 liblastfm quazip qtkeychain ]) ++ [
-    libechonestQT5 kf5_latest.attica cmake pkgconfig boost gnutls lucenepp
-    vlc qt54.base sparsehash taglib websocketpp makeWrapper
+  buildInputs = (map useQT5 [ qca2 liblastfm quazip ]) ++ [
+    qtkeychainQT5 libechonestQT5 kf5_latest.attica 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);