From f7e934e74595a0d7524159d6faa1bf168572bb5d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Aug 2016 18:27:44 +0200
Subject: pkgs/tomahawk: Fix/reorganize build dependencies

This fixes the build for Tomahawk because some of these dependencies
were already refactored in upstream <nixpkgs> and hence we can simply
specify the dependencies directly.

Alongside of this, I've broken out some of the buildInputs into
nativeBuildInputs, so this will stay safe for cross compilation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/default.nix          |  5 ++++-
 pkgs/tomahawk/default.nix | 19 +++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index fb3fd5bd..2b617c6e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -28,7 +28,10 @@ let
     show-qr-code = callPackage ./show-qr-code { };
     sidplayfp = callPackage ./sidplayfp { };
     tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { };
-    tomahawk = callPackage ./tomahawk { qt5 = pkgs.qt55; };
+    tomahawk = callPackage ./tomahawk {
+      qt5 = pkgs.qt55;
+      boost = pkgs.boost155;
+    };
     twitchstream = callPackage ./twitchstream { };
 
     games = import ./games {
diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix
index 7b2835b9..79510582 100644
--- a/pkgs/tomahawk/default.nix
+++ b/pkgs/tomahawk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, boost, gnutls
-, libechonest, liblastfm, lucenepp, qca-qt5, qt5, qtkeychain
-, kde5, sparsehash, taglib, websocketpp, makeWrapper, ffmpeg_2, v4l_utils
+, libechonest, liblastfm, lucenepp, qt5, qtkeychain, kde5, sparsehash, taglib
+, websocketpp, ffmpeg_2, v4l_utils
 
 , enableXMPP      ? true,  libjreen     ? null
 , enableKDE       ? false, kdelibs      ? null
@@ -52,10 +52,6 @@ let
     };
   };
 
-  attica = kde5.attica.override { extra-cmake-modules = ecm; };
-  ecm = kde5.extra-cmake-modules.override { inherit (qt5) qttools; };
-  qca = qca-qt5.override { inherit (qt5) qtbase; };
-
 in stdenv.mkDerivation rec {
   name = "tomahawk-${version}";
   version = "0.9.0-git";
@@ -72,10 +68,13 @@ in stdenv.mkDerivation rec {
     "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
   ];
 
-  buildInputs = (map useQT5 [ liblastfm qt5.quazip ]) ++ [
-    qca qtkeychainQT5 libechonestQT5 attica cmake pkgconfig ecm boost gnutls
-    lucenepp vlc qt5.qtbase qt5.qtsvg qt5.qttools qt5.qtwebkit qt5.qtx11extras
-    sparsehash taglib websocketpp makeWrapper
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = (with qt5; [
+    attica ecm qca-qt5 qtbase qtsvg qttools qtwebkit qtx11extras
+  ]) ++ map useQT5 [ liblastfm qt5.quazip ] ++ [
+    boost gnutls lucenepp sparsehash taglib vlc websocketpp
+    qtkeychainQT5 libechonestQT5
   ] ++ stdenv.lib.optional enableXMPP      (useQT5 libjreen)
     ++ stdenv.lib.optional enableKDE       (useQT5 kdelibs)
     ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt);
-- 
cgit 1.4.1