From 31dfbca2d728e6dccd7c6293e36964e62c0ca8de Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 29 Nov 2020 11:35:27 +0000 Subject: [PATCH] cmake: 3.19.0 -> 3.19.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes issues with building LibreSSL, which is required for the NixOS tests: https://cmake.org/cmake/help/latest/release/3.19.html#id1 > CMake 3.19.0 compiles source files with the `LANGUAGE` property by > passing an explicit language flag such as -x c. This is consistent > with the property’s documented meaning that the source file is written > in the specified language. However, it can break projects that were > using the property only to cause the specified language’s compiler to > be used. This has been reverted to restore behavior from CMake 3.18 > and below. --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index b057f8c70df..ef8a5324487 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.19.0"; + version = "3.19.1"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "14zlrb7awiazxc5wlvgah9rw1dm4ziczbxiyqsvp4zmaan0ninpx"; + sha256 = "1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx"; }; patches = [