cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qbittorrent: Wrap once, python is optional

Browse source 
qbittorrent is wrapped twice which must be generally be avoided as it
breaks the program's basename, e.g. `argv[0]` ends up with
".qbittorrent-wrapped" rather than "qbittorrent" as basename.

This becomes relevant when matching for (exact) program names: pgrep(1),
earlyoom(1)'s `--avoid`, etc.

Furthermore, Python is only required by the (default enabled) tracker
search feature.

Since the "qbittorrent" ELF executable is wrapped automatically as a Qt
app, replace the unconditional `postInstall` hook with an optional
addition to `makeWrapperArgs` with is used by `wrapQtApp` eventually.

This merges two wrappers and thus fixes the basename.
This commit is contained in:
Klemens Nanni 2022-05-28 10:27:24 +02:00
parent 558da46289
commit 670cb2103a
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/p2p/qbittorrent/default.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkg-config
{ mkDerivation, lib, fetchFromGitHub, pkg-config
, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
, debugSupport ? false
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
@ -24,7 +24,7 @@ mkDerivation rec {
enableParallelBuilding = true;
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ makeWrapper pkg-config ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support
@ -40,11 +40,7 @@ mkDerivation rec {
++ optional (!webuiSupport) "--disable-webui"
++ optional debugSupport "--enable-debug";
postInstall = "wrapProgram $out/bin/${
if guiSupport
then "qbittorrent"
else "qbittorrent-nox"
} --prefix PATH : ${makeBinPath [ python3 ]}";
qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}";
meta = {
description = "Featureful free software BitTorrent client";