JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15056 from simonvandel/fix-qbittorent-qmake

Browse Source 
Fix qbittorent qmake build error
This commit is contained in:
Robin Gloster 2016-05-02 11:35:09 +02:00
commit 5a2b26cf7b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/p2p/qbittorrent/default.nix
View File

@ -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
@ -10,18 +10,24 @@ 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 ];
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}"

2
pkgs/top-level/all-packages.nix
View File

@ -13660,7 +13660,7 @@ in
pythonmagick = callPackage ../applications/graphics/PythonMagick { };
qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {
qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent {
boost = boost;
libtorrentRasterbar = libtorrentRasterbar;
};