From d5d8b3514d64fcd4022186795f604ec3f360ae17 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 11 Dec 2019 21:49:21 +0100 Subject: [PATCH] darwin.CF: fix retry condition (close PR #75528) Using a function in an if condition when set -e is set doesn't seem to break out or return false which means the workaround from 41ca86129fa18278758e177d1821351dc608d24c never gets triggered. --- pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 1df7070e7a3..4f2f84b3c0a 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation { # later. buildPhase = stdenv.lib.optionalString true '' for i in {1..512}; do - if ninjaBuildPhase; then - break + if ninja -j $NIX_BUILD_CORES; then + break fi echo >&2