diff options
| author | Simon Vandel Sillesen <simon.vandel@gmail.com> | 2016-04-28 18:10:37 +0200 |
|---|---|---|
| committer | Simon Vandel Sillesen <simon.vandel@gmail.com> | 2016-05-01 15:05:56 +0200 |
| commit | 05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1 (patch) | |
| tree | eabfb4b70ddc63353d1b8ac5674abf8a8e9cfe2e /pkgs | |
| parent | 63d016b3359355b8a75da1d9f27ea3a6d134c2e0 (diff) | |
| download | nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.tar nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.tar.gz nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.tar.bz2 nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.tar.lz nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.tar.xz nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.tar.zst nixlib-05f2ebe16d6fdbd159d6b25a8d0dfb30135638e1.zip | |
qBittorrent: fix qmake not found in qbittorrent build
Thanks to @romildo for finding the configure fix.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index d0e938c1b30c..ee03bfeedb09 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, which -, boost, libtorrentRasterbar, qt5 +, boost, libtorrentRasterbar, qmakeHook, qt5 , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -17,11 +17,17 @@ stdenv.mkDerivation rec { sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkgconfig which qmakeHook ]; buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ] ++ optional guiSupport dbus_libs; + dontUseQmakeConfigure = true; + + preConfigure = '' + export QT_QMAKE="$qtOut/bin" + ''; + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" "--with-boost=${boost.dev}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1254917f08e5..8ef5e4112ba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13634,7 +13634,7 @@ in pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { + qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent { boost = boost; libtorrentRasterbar = libtorrentRasterbar; }; |