summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorSimon Vandel Sillesen <simon.vandel@gmail.com>2016-01-20 10:10:51 +0100
committerSimon Vandel Sillesen <simon.vandel@gmail.com>2016-01-21 19:15:04 +0100
commit71ab92a39628b79b1f038874fae6501ee1bcf201 (patch)
treeff180b761c7ae601491ae0f0ae4afaf7f95dcf58 /pkgs/applications
parent2d681fdcf7e2ba7b8113fedc6a858c24f7a04f43 (diff)
downloadnixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.tar
nixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.tar.gz
nixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.tar.bz2
nixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.tar.lz
nixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.tar.xz
nixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.tar.zst
nixpkgs-71ab92a39628b79b1f038874fae6501ee1bcf201.zip
qbittorrent: 3.3.1 -> 3.3.3
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/p2p/qbittorrent/default.nix4
-rw-r--r--pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch9
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index bc5289f8093..31931aa75d9 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
+    sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
index 9e3e484667f..a906803e433 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
+++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
@@ -1,12 +1,17 @@
 diff --git a/qm_gen.pri b/qm_gen.pri
-index ed29b76..2d5990c 100644
+index 5454440..2d5990c 100644
 --- a/qm_gen.pri
 +++ b/qm_gen.pri
-@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
+@@ -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 }