diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-05-30 16:30:06 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-05-30 16:30:06 -0500 |
| commit | 7299f68a05c08714d4a32ee759ed264b4b459f6f (patch) | |
| tree | c26dff6ab5d0580e35bdf22adc2d9b3f4f3f24fe /pkgs/applications/networking/p2p/qbittorrent | |
| parent | e0d03c43bf2deb01b27a61154560df8576f305eb (diff) | |
| download | nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.tar nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.tar.gz nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.tar.bz2 nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.tar.lz nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.tar.xz nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.tar.zst nixpkgs-7299f68a05c08714d4a32ee759ed264b4b459f6f.zip | |
qbittorrent: don't use qmakeHook
Qt now configures QMake for all builds so there is no need to invoke `qmakeHook` just to get a working `qmake`.
Diffstat (limited to 'pkgs/applications/networking/p2p/qbittorrent')
| -rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 77624c0d938..78f2c79923a 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -17,15 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1f4impsjck8anl39pwypsck7j6xw0dl18qd0b4xi23r45jvx9l60"; }; - nativeBuildInputs = [ pkgconfig which qmakeHook ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ] ++ optional guiSupport dbus_libs; - dontUseQmakeConfigure = true; - preConfigure = '' - export QT_QMAKE="$qtOut/bin" + export QT_QMAKE=$(dirname "$QMAKE") ''; configureFlags = [ |