Skip to content

Commit 2c981cb

Browse files
qbittorrent-enhanced: 4.6.7.10 -> 5.0.2.10; add nox variant (NixOS#358112)
2 parents 39fd969 + 612f825 commit 2c981cb

File tree

2 files changed

+14
-35
lines changed

2 files changed

+14
-35
lines changed
Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,25 @@
1-
{ lib
2-
, stdenv
3-
, fetchFromGitHub
4-
, cmake
5-
, pkg-config
6-
, boost
7-
, libtorrent-rasterbar
8-
, openssl
9-
, qt5
10-
, zlib
1+
{
2+
lib,
3+
fetchFromGitHub,
4+
qbittorrent,
5+
guiSupport ? true,
116
}:
127

13-
stdenv.mkDerivation rec {
14-
pname = "qbittorrent-enhanced";
15-
version = "4.6.7.10";
8+
(qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
9+
pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
10+
version = "5.0.2.10";
1611

1712
src = fetchFromGitHub {
1813
owner = "c0re100";
1914
repo = "qBittorrent-Enhanced-Edition";
2015
rev = "release-${version}";
21-
hash = "sha256-Mr376nH2pE6NMF9IdDhZULwqkRr7472OZnKO86hb6ZI=";
16+
hash = "sha256-9RCG530zWQ+qzP0Y+y69NFlBWVA8GT29dY8aC1cvq7o=";
2217
};
2318

24-
nativeBuildInputs = [
25-
pkg-config
26-
cmake
27-
qt5.wrapQtAppsHook
28-
];
29-
30-
buildInputs = [
31-
openssl.dev
32-
boost
33-
zlib
34-
libtorrent-rasterbar
35-
qt5.qtbase
36-
qt5.qttools
37-
];
38-
39-
meta = {
19+
meta = old.meta // {
4020
description = "Unofficial enhanced version of qBittorrent, a BitTorrent client";
4121
homepage = "https://github.com/c0re100/qBittorrent-Enhanced-Edition";
42-
changelog = "https://github.com/c0re100/qBittorrent-Enhanced-Edition/blob/${src.rev}/Changelog";
43-
license = with lib.licenses; [ gpl2Only gpl3Only ];
22+
changelog = "https://github.com/c0re100/qBittorrent-Enhanced-Edition/blob/release-${version}/Changelog";
4423
maintainers = with lib.maintainers; [ ByteSudoer ];
45-
mainProgram = "qBittorrent-enhanced";
46-
platforms = lib.platforms.linux;
4724
};
48-
}
25+
})

pkgs/top-level/all-packages.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15211,6 +15211,8 @@ with pkgs;
1521115211

1521215212
qbittorrent-nox = qbittorrent.override { guiSupport = false; };
1521315213

15214+
qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };
15215+
1521415216
qcad = libsForQt5.callPackage ../applications/misc/qcad { };
1521515217

1521615218
qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };

0 commit comments

Comments
 (0)