diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
| commit | fda26c8476c1684f77bacacf2b5c46b1fbf65b41 (patch) | |
| tree | 84752640ad3cf64ba372bdd4aab713c097023281 /pkgs/applications/networking/p2p | |
| parent | 21976d1fbd612f67825473a7a2b05bb1387e5840 (diff) | |
| parent | 6b8806dff7a2cd11e37944af1bbb276ceb870199 (diff) | |
| download | nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.gz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.bz2 nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.lz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.xz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.zst nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.zip | |
Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch | 18 |
2 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 3baa5a8e480d..9b6f2f1f1bb1 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -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"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch deleted file mode 100644 index a906803e4336..000000000000 --- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch +++ /dev/null @@ -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 } - } |