diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-06-15 14:32:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 14:32:09 +0100 |
| commit | 31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e (patch) | |
| tree | c4e13114118c53fce8bb54bf3a4ab21dd8fc1f57 /pkgs/applications/networking | |
| parent | d6d3ae2b12a2eb4feaf1ad9bc5c82ac18e1d4223 (diff) | |
| parent | 0b8e92a7fde68a7d1023fa504a6551e0b7046148 (diff) | |
| download | nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.tar nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.tar.gz nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.tar.bz2 nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.tar.lz nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.tar.xz nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.tar.zst nixlib-31e0e3caaf97eb9a07ee69b4832d095f4bbc4a9e.zip | |
Merge pull request #41944 from erosennin/ktorrent-cmake-3.11
ktorrent: fix build with CMake 3.11
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/p2p/ktorrent/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 219615abb02a..fbd01c388b0d 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchurl, fetchpatch, cmake , extra-cmake-modules, qtbase, qtscript , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig , kdoctools, kross, kcmutils, kwindowsystem @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { libktorrent taglib libgcrypt kplotting ]; + patches = [ + # Fix build with CMake 3.11 + (fetchpatch { + url = "https://cgit.kde.org/ktorrent.git/patch/?id=672c5076de7e3a526d9bdbb484a69e9386bc49f8"; + sha256 = "1cn4rnbhadrsxqx50fawpd747azskavbjraygr6s11rh1wbfrxid"; + }) + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { |