forked from mirrors/nixpkgs
cmake: 3.19.1 -> 3.19.2
This commit is contained in:
parent
09a970dcd2
commit
dfb2a526e3
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, pkgconfig, fetchpatch
|
||||
{ stdenv, lib, fetchurl, pkgconfig
|
||||
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
|
||||
, buildPackages
|
||||
# darwin attributes
|
||||
|
@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
|
|||
+ lib.optionalString useNcurses "-cursesUI"
|
||||
+ lib.optionalString withQt5 "-qt5UI"
|
||||
+ lib.optionalString useQt4 "-qt4UI";
|
||||
version = "3.19.1";
|
||||
version = "3.19.2";
|
||||
|
||||
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 = "1fisi9rlijw9wd0yjzk1c6j7ljnb2yiq5iqnrz6m1xkflyinw9hx";
|
||||
sha256 = "1w67w0ak6vf37501dlz9yhnzlvvpw1w10n2nm3hi7yxp4cxzvq73";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -38,12 +38,6 @@ stdenv.mkDerivation rec {
|
|||
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
|
||||
./libuv-application-services.patch
|
||||
|
||||
# Fix namelink failures, can be removed in 3.19.2+
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.kitware.com/cmake/cmake/-/commit/38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82.patch";
|
||||
sha256 = "17yr66wrayhmavsz46b37zfwp2jcwab1zig2xqps39ysndf74qjc";
|
||||
})
|
||||
|
||||
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
|
Loading…
Reference in a new issue