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

Merge pull request #29971 from yegortimoshenko/qbittorrent/3.3.16

Browse Source 
qbittorrent: 3.3.15 -> 3.3.16, drop patch, enable parallel build
This commit is contained in:
Orivej Desh 2017-10-01 00:21:07 +00:00 committed by GitHub
commit 5de2cffda0
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,15 +6,15 @@
}:
assert guiSupport -> (dbus_libs != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "3.3.15";
version = "3.3.16";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "1bnfnbkdg0088h25zzhlpcdh30y0k1m76bkhjsj1aali765c1fx7";
sha256 = "0mxyn2pajvb55bhcaz55v64p2xzy15p0yy174s62b5y3f8cac27a";
};
nativeBuildInputs = [ pkgconfig which ];
@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
(if webuiSupport then "" else "--disable-webui")
] ++ optional debugSupport "--enable-debug";
# The lrelease binary is named lrelease instead of lrelease-qt4
patches = [ ./fix-lrelease.patch ];
# https://github.com/qbittorrent/qBittorrent/issues/1992
enableParallelBuilding = false;
enableParallelBuilding = true;
meta = {
description = "Free Software alternative to µtorrent";

18
pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
View File

@ -1,18 +0,0 @@
diff --git a/qm_gen.pri b/qm_gen.pri
index 5454440..2d5990c 100644
--- a/qm_gen.pri
+++ b/qm_gen.pri
@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
unix {
- equals(QT_MAJOR_VERSION, 4) {
- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
- }
- equals(QT_MAJOR_VERSION, 5) {
- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
- }
+ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
} else {
!exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
}