diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-07-04 23:03:59 +0000 |
|---|---|---|
| committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-07-04 23:03:59 +0000 |
| commit | e7facc718e87d4b8eec51d3fefff6e1b850f8d4e (patch) | |
| tree | 8892132ea117804d57a97e48992906920848be6f /pkgs/development | |
| parent | 6afda416866ef72b75a09eb1c10bec8cb7cb018a (diff) | |
| download | nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.tar nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.tar.gz nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.tar.bz2 nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.tar.lz nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.tar.xz nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.tar.zst nixlib-e7facc718e87d4b8eec51d3fefff6e1b850f8d4e.zip | |
cmake: fix build with libuv 1.21 (#43052)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 438aa81a9d0a..ed0928febe29 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , majorVersion ? "3.11" # darwin attributes @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { # Don't search in non-Nix locations such as /usr, but do search in our libc. patches = [ ./search-path-3.9.patch ] + ++ optional (versionOlder version "3.12") (fetchpatch { + name = "cmake-3.11-libuv-1.21.patch"; + url = https://gitlab.kitware.com/cmake/cmake/commit/889033b5c6847cf1f7bd789384405d59dc333bf6.patch; + sha256 = "0683zbyb3bicaxqzrj4wgdan6x08k30m20kkmpjvw30nr6a8r6xq"; + }) # Don't depend on frameworks. ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; |