Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 507d24a7def2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c97fcb4d2b08
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 1, 2018

  1. qbittorrent: 4.1.0 -> 4.1.1 (#41252)

    @Anton-Latukha @orivej
    Anton-Latukha authored and orivej committed Jun 1, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c97fcb4 View commit details
Showing with 18 additions and 15 deletions.
  1. +18 −15 pkgs/applications/networking/p2p/qbittorrent/default.nix
33 changes: 18 additions & 15 deletions pkgs/applications/networking/p2p/qbittorrent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,47 @@
{ stdenv, fetchurl, pkgconfig, which
{ stdenv, fetchFromGitHub, pkgconfig
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
, debugSupport ? false # Debugging
, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
}:

assert guiSupport -> (dbus_libs != null);
assert guiSupport -> (dbus != null);
with stdenv.lib;

stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "4.1.0";
version = "4.1.1";

src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
sha256 = "09bf1jr2sfdps8cb154gjw7zhdcpsamhnfbgacdmkfyd7qgcbykf";
};

nativeBuildInputs = [ pkgconfig which ];
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ pkgconfig ];

buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
++ optional guiSupport dbus_libs;
++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support

# Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
QMAKE_LRELEASE = "lrelease";

configureFlags = [
"--with-boost-libdir=${boost.out}/lib"
"--with-boost=${boost.dev}"
(if guiSupport then "" else "--disable-gui")
(if webuiSupport then "" else "--disable-webui")
] ++ optional debugSupport "--enable-debug";
"--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";

enableParallelBuilding = true;

meta = {
description = "Free Software alternative to µtorrent";
description = "Featureful free software BitTorrent client";
homepage = https://www.qbittorrent.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ viric ];
maintainers = with maintainers; [ Anton-Latukha viric ];
};
}