swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-19 04:03:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95327 from primeos/cmake-fix-pch-regression

Browse source 
cmake: Add a patch to fix a regression since CMake 3.18
This commit is contained in:
Michael Weiss 2020-08-14 18:46:30 +02:00 committed by GitHub
parent 913ec2f78b 57f0574595
commit e3e1aa0536
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -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" ];