mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

qBittorrent: fix qmake not found in qbittorrent build

Browse source 
Thanks to @romildo for finding the configure fix.
This commit is contained in:
Simon Vandel Sillesen 2016-04-28 18:10:37 +02:00
parent 63d016b335
commit 05f2ebe16d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/p2p/qbittorrent/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which { stdenv, fetchurl, pkgconfig, which
, boost, libtorrentRasterbar, qt5 , boost, libtorrentRasterbar, qmakeHook, qt5
, debugSupport ? false # Debugging , debugSupport ? false # Debugging
, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI , webuiSupport ? true # WebUI
@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60"; sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60";
}; };
nativeBuildInputs = [ pkgconfig which ]; nativeBuildInputs = [ pkgconfig which qmakeHook ];
buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ] buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
++ optional guiSupport dbus_libs; ++ optional guiSupport dbus_libs;
dontUseQmakeConfigure = true;
preConfigure = ''
export QT_QMAKE="$qtOut/bin"
'';
configureFlags = [ configureFlags = [
"--with-boost-libdir=${boost.lib}/lib" "--with-boost-libdir=${boost.lib}/lib"
"--with-boost=${boost.dev}" "--with-boost=${boost.dev}"

2
pkgs/top-level/all-packages.nix
View file

@ -13634,7 +13634,7 @@ in
pythonmagick = callPackage ../applications/graphics/PythonMagick { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { };
qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent {
boost = boost; boost = boost;
libtorrentRasterbar = libtorrentRasterbar; libtorrentRasterbar = libtorrentRasterbar;
}; };