From 63d016b3359355b8a75da1d9f27ea3a6d134c2e0 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 28 Apr 2016 18:09:55 +0200
Subject: qbittorrent: 3.3.3 -> 3.3.4

---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 31931aa75d92..d0e938c1b30c 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.3";
+  version = "3.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw";
+    sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
-- 
cgit 1.4.1


From 05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 28 Apr 2016 18:10:37 +0200
Subject: qBittorrent: fix qmake not found in qbittorrent build

Thanks to @romildo for finding the configure fix.
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix                          |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index d0e938c1b30c..ee03bfeedb09 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qt5
+, boost, libtorrentRasterbar, qmakeHook, qt5
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
     sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60";
   };
 
-  nativeBuildInputs = [ pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig which qmakeHook ];
 
   buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
     ++ optional guiSupport dbus_libs;
 
+  dontUseQmakeConfigure = true;
+
+  preConfigure = ''
+    export QT_QMAKE="$qtOut/bin"
+  '';
+
   configureFlags = [
     "--with-boost-libdir=${boost.lib}/lib"
     "--with-boost=${boost.dev}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1254917f08e5..8ef5e4112ba0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13634,7 +13634,7 @@ in
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
-  qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {
+  qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent {
     boost = boost;
     libtorrentRasterbar = libtorrentRasterbar;
   };
-- 
cgit 1.4.1