diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-30 22:41:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 22:41:45 +0200 |
| commit | 5466ae6f3fed81b585d206419137ae955040b4f5 (patch) | |
| tree | fc4112380cefa4b8a7b37449b73996ef16b9dd09 /pkgs/applications | |
| parent | 741e3c486d5e2281306ff4bd93ea55c0dbd613f2 (diff) | |
| parent | 670cb2103a4d41705ce33ceff39c1636073d9dce (diff) | |
| download | nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.tar nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.tar.gz nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.tar.bz2 nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.tar.lz nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.tar.xz nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.tar.zst nixpkgs-5466ae6f3fed81b585d206419137ae955040b4f5.zip | |
Merge pull request #175089 from klemensn/qbittorrent-fix-wrap
qbittorrent: Wrap once, python is optional
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 61a20ffb8ad..3fb48dd6a53 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -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"; |