diff options
| author | toonn <toonn@toonn.io> | 2021-04-27 19:21:05 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-24 15:17:13 -0800 |
| commit | 3b2d3f65b799d4c682fb4b0cf025f0812429faa4 (patch) | |
| tree | 2033dbf17fe3e2fecbd83a4d93a756bc7332bda5 /pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | |
| parent | 2bb0e256ea97dbddb21490ad788db3a1cf443a6e (diff) | |
| download | nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.tar nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.tar.gz nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.tar.bz2 nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.tar.lz nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.tar.xz nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.tar.zst nixpkgs-3b2d3f65b799d4c682fb4b0cf025f0812429faa4.zip | |
darwin.CF: Drop clang 7 workaround
Diffstat (limited to 'pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix')
| -rw-r--r-- | pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 59bff5fac14..d16cc3a12c7 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -73,24 +73,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - # FIXME: Workaround for intermittent build failures of CFRuntime.c. - # Based on testing this issue seems to only occur with clang_7, so - # please remove this when updating the default llvm versions to 8 or - # later. - buildPhase = lib.optionalString true '' - for i in {1..1}; do - if ninja -j $NIX_BUILD_CORES; then - break - fi - - echo >&2 - echo "[$i/512] retrying build, workaround for #66811" >&2 - echo " With clang_7 the build of CFRuntime.c fails intermittently." >&2 - echo " See https://github.com/NixOS/nixpkgs/issues/66811 for more details." >&2 - echo >&2 - continue - done - ''; + buildPhase = "ninja -j $NIX_BUILD_CORES"; # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now # Also, this includes a bunch of private headers in the framework, which is not what we want |