diff options
| author | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
| commit | 8031cba2ab3146977141fc504bea2a1e03b5c126 (patch) | |
| tree | 0cd68c0007851dfed7d7f8247754b5c4b356704e /pkgs/applications/networking/p2p/qbittorrent/default.nix | |
| parent | 2a5e64b69c83592caf900cb0b7213235e96368de (diff) | |
| parent | 656c48f141be5886c515a1a874a47472cbbac6bd (diff) | |
| download | nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.gz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.bz2 nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.lz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.xz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.zst nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/networking/p2p/qbittorrent/default.nix')
| -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 = [ |