diff options
| author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-24 17:29:20 +0100 |
|---|---|---|
| committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-24 17:29:20 +0100 |
| commit | 0a1dd3ced1d7a0d7d611c9f64e02fa9cd3ba3c6d (patch) | |
| tree | a55d636b68c5d8266e8b3de05a1bcbbf925e21c3 /pkgs/applications/networking/p2p | |
| parent | c0aeb3305473e3a0df97785f562ea8707630e999 (diff) | |
treewide: remove global with lib; in pkgs/{misc,networking}
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 76fc70b3bad0f..319a5e7f0dc80 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -9,7 +9,6 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); -with lib; mkDerivation rec { pname = "qbittorrent"; version = "4.4.5"; @@ -27,8 +26,8 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support - ++ optional trackerSearch python3; + ++ lib.optional guiSupport dbus # D(esktop)-Bus depends on GUI support + ++ lib.optional trackerSearch python3; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; @@ -36,11 +35,11 @@ mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ] - ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files - ++ optional (!webuiSupport) "--disable-webui" - ++ optional debugSupport "--enable-debug"; + ++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files + ++ lib.optional (!webuiSupport) "--disable-webui" + ++ lib.optional debugSupport "--enable-debug"; - qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}"; + qtWrapperArgs = lib.optional trackerSearch "--prefix PATH : ${lib.makeBinPath [ python3 ]}"; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} @@ -48,7 +47,7 @@ mkDerivation rec { makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent ''; - meta = { + meta = with lib; { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; |