From 71ab92a39628b79b1f038874fae6501ee1bcf201 Mon Sep 17 00:00:00 2001 From: Simon Vandel Sillesen Date: Wed, 20 Jan 2016 10:10:51 +0100 Subject: [PATCH] qbittorrent: 3.3.1 -> 3.3.3 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- .../networking/p2p/qbittorrent/fix-lrelease.patch | 9 +++++++-- 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 bc5289f80935..31931aa75d92 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 9e3e484667fe..a906803e4336 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 }