diff options
| author | Alexey Shmalko <rasen.dubi@gmail.com> | 2017-07-01 14:29:30 +0300 |
|---|---|---|
| committer | Alexey Shmalko <rasen.dubi@gmail.com> | 2017-07-01 14:29:30 +0300 |
| commit | 85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0 (patch) | |
| tree | bcaa94642dda808be968a9a93dca778f0aefd9eb /pkgs/applications/networking/p2p | |
| parent | 210f6888023c1df8aff2d053a5e41f5e1effdfe7 (diff) | |
| download | nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.tar nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.tar.gz nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.tar.bz2 nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.tar.lz nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.tar.xz nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.tar.zst nixlib-85a8323e8f2964b9a7cfd4021e2f7cb73c0ad7b0.zip | |
qbittorrent: fix build
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).
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 4db6c9dc16bb..458aa677b89f 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, qmake, qtbase, qttools +, boost, libtorrentRasterbar, qtbase, qttools , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn"; }; - nativeBuildInputs = [ pkgconfig which qmake ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ boost libtorrentRasterbar qtbase qttools ] ++ optional guiSupport dbus_libs; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ] ++ optional debugSupport "--enable-debug"; # 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; meta = { |