about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-31 17:02:15 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-03-31 17:02:15 +0200
commitccf8ccbaaf39d744acb056788527de2683fbbe1b (patch)
tree2d9a3618786cef4151ed0602201c48b9694f6c8a /pkgs
parent71ba447c75f558aa7be4a24aaf558b18bb2f61b7 (diff)
tomahawk: Add include suffix for QuaZip.
Same as with 9ea16e0 and d3bfedd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tomahawk/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix
index 57fd3479..c6a5f47e 100644
--- a/pkgs/tomahawk/default.nix
+++ b/pkgs/tomahawk/default.nix
@@ -41,6 +41,12 @@ let
     '';
   });
 
+  quazipQT5 = overrideDerivation (useQT5 quazip) (drv: {
+    postInstall = ''
+      ln -sv "$out/include/quazip" "$out/include/quazip5"
+    '';
+  });
+
   qtkeychainQT5 = overrideDerivation (useQT5 qtkeychain) (drv: {
     cmakeFlags = (drv.cmakeFlags or []) ++ [
       "-DBUILD_WITH_QT4=OFF"
@@ -68,13 +74,13 @@ in stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DLUCENEPP_INCLUDE_DIR=${lucenepp}/include"
     "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
-    "-DQUAZIP_INCLUDE_DIR=${useQT5 quazip}/include"
-    "-DQUAZIP_LIBRARIES=${useQT5 quazip}/lib/libquazip.so"
+    "-DQUAZIP_INCLUDE_DIR=${quazipQT5}/include"
+    "-DQUAZIP_LIBRARIES=${quazipQT5}/lib/libquazip.so"
   ];
 
   buildInputs = [
-    qcaQT5 qtkeychainQT5 libechonestQT5 liblastfmQT5 kf5_latest.attica cmake
-    pkgconfig boost gnutls lucenepp vlc qt54.base qt54.svg qt54.tools
+    qcaQT5 qtkeychainQT5 libechonestQT5 liblastfmQT5 quazipQT5 kf5_latest.attica
+    cmake pkgconfig boost gnutls lucenepp vlc qt54.base qt54.svg qt54.tools
     qt54.x11extras sparsehash taglib websocketpp makeWrapper
   ] ++ stdenv.lib.optional enableXMPP      (useQT5 libjreen)
     ++ stdenv.lib.optional enableKDE       (useQT5 kdelibs)