From 8f8712b1e19abc3fad342f23c28beef362190990 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 31 Oct 2014 19:30:37 -0700 Subject: [PATCH] qbittorrent: Refactor --- .../networking/p2p/qbittorrent/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 2294dd245a5..51c43771bcf 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -2,15 +2,21 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "qbittorrent-3.1.10"; + name = "qbittorrent-3.1.11"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0xhqli191r5v9b5x6wj1wsjlj6svf6ldgzl7jza39q3ipr5c2pg6"; + sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i"; }; - buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar - pkgconfig ]; + buildInputs = [ + qt4 which dbus_libs boost libtorrentRasterbar pkgconfig + ]; + + configureFlags = [ + "--with-libboost-lib=${boost.lib}/lib" + "--with-libboost-inc=${boost.dev}/include" + ]; # https://github.com/qbittorrent/qBittorrent/issues/1992 #enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e41450296b..5a4ec5d82b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10273,7 +10273,9 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; + qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { + libtorrentRasterbar = libtorrentRasterbar_0_16; + }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; };