mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-05 20:12:52 +00:00
cmake: Add a patch to fix a regression since CMake 3.18
This fixes all CMake builds that use target_precompile_headers() and as a result fail since CMake 3.18 with e.g.: g++: error: unrecognized command line option '-Xarch_x86_64'; did you mean '-march=x86-64'? Fix #94905. CMake references: - https://gitlab.kitware.com/cmake/cmake/-/issues/21072 - https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5118
This commit is contained in:
parent
7e189c56a1
commit
57f0574595
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, pkgconfig
|
||||
{ stdenv, lib, fetchurl, pkgconfig, fetchpatch
|
||||
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
|
||||
, buildPackages
|
||||
# darwin attributes
|
||||
|
@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
|
|||
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
|
||||
./libuv-application-services.patch
|
||||
|
||||
# TODO: Remove this patch for a regression once CMake 3.18.2 is out:
|
||||
(fetchpatch { # PCH: Avoid Apple-specific architecture flags on other platforms
|
||||
url = "https://gitlab.kitware.com/cmake/cmake/-/commit/70ce1ad64a04a244bb1c03753da0752c61fc3a37.patch";
|
||||
sha256 = "0jcdgv48j0dd4nlhyy3j0s3h6bcbrq2yg1mdhpgfqrb2y3p91fky";
|
||||
})
|
||||
|
||||
] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
|
Loading…
Reference in a new issue