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

qbittorrent: fix build

Browse Source 
The qbittorrent has been broken by
210f6888023c1df8aff2d053a5e41f5e1effdfe7, which adds `qmake` as a
build input. `qmake` is overriding the default configure phase (which
should be `./configure ...` for qbittorrent) so build goes wrong.

Remove `qmake` from build inputs (basically, reverting the said
commit).
This commit is contained in:
Alexey Shmalko 2017-07-01 14:29:30 +03:00
parent 210f688802
commit 85a8323e8f
No known key found for this signature in database
GPG Key ID: DCEF7BCCEB3066C3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which { stdenv, fetchurl, pkgconfig, which
, boost, libtorrentRasterbar, qmake, qtbase, qttools , boost, libtorrentRasterbar, qtbase, qttools
, debugSupport ? false # Debugging , debugSupport ? false # Debugging
, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI , webuiSupport ? true # WebUI
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn"; sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn";
}; };
nativeBuildInputs = [ pkgconfig which qmake ]; nativeBuildInputs = [ pkgconfig which ];
buildInputs = [ boost libtorrentRasterbar qtbase qttools ] buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
++ optional guiSupport dbus_libs; ++ optional guiSupport dbus_libs;
@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
] ++ optional debugSupport "--enable-debug"; ] ++ optional debugSupport "--enable-debug";
# The lrelease binary is named lrelease instead of lrelease-qt4 # The lrelease binary is named lrelease instead of lrelease-qt4
patches = [ ./fix-lrelease.patch]; patches = [ ./fix-lrelease.patch ];
# https://github.com/qbittorrent/qBittorrent/issues/1992 # https://github.com/qbittorrent/qBittorrent/issues/1992
enableParallelBuilding = false; enableParallelBuilding = false;
meta = { meta = {