diff options
| author | Simon Vandel Sillesen <simon.vandel@gmail.com> | 2016-01-01 22:23:51 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-01-02 22:47:28 +0100 |
| commit | fecea0b305940e92234218e27fede564518569c5 (patch) | |
| tree | 13ed962da093d80275bfd73aa691db18328ef0dd /pkgs/applications/networking/p2p | |
| parent | a158f61313498def344bafbc81d60733e577ba8b (diff) | |
| download | nixlib-fecea0b305940e92234218e27fede564518569c5.tar nixlib-fecea0b305940e92234218e27fede564518569c5.tar.gz nixlib-fecea0b305940e92234218e27fede564518569c5.tar.bz2 nixlib-fecea0b305940e92234218e27fede564518569c5.tar.lz nixlib-fecea0b305940e92234218e27fede564518569c5.tar.xz nixlib-fecea0b305940e92234218e27fede564518569c5.tar.zst nixlib-fecea0b305940e92234218e27fede564518569c5.zip | |
qbittorrent: 3.2.3 -> 3.3.1
* upstream has switched to qt5 as default, so also done here * Adds a patch to use the qt lrelease tool correct
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch | 13 |
2 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index f8c025ba2418..bc5289f80935 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, qt4 +, boost, libtorrentRasterbar, qt5 , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -10,16 +10,16 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.2.3"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6"; + sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs"; }; nativeBuildInputs = [ pkgconfig which ]; - buildInputs = [ boost libtorrentRasterbar qt4 ] + buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ] ++ optional guiSupport dbus_libs; configureFlags = [ @@ -29,6 +29,9 @@ 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; diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch new file mode 100644 index 000000000000..9e3e484667fe --- /dev/null +++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch @@ -0,0 +1,13 @@ +diff --git a/qm_gen.pri b/qm_gen.pri +index ed29b76..2d5990c 100644 +--- a/qm_gen.pri ++++ b/qm_gen.pri +@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) { + win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + unix { +- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } ++ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } else { + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } + } |