diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-12-11 21:49:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-12-12 08:16:32 +0100 |
| commit | d5d8b3514d64fcd4022186795f604ec3f360ae17 (patch) | |
| tree | b2e50e5fdc09e0a668ba54880a4779b94075b22f /pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | |
| parent | a376f1849d387bcbe372b1d55ea6bc67ceba38ea (diff) | |
| download | nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.tar nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.tar.gz nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.tar.bz2 nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.tar.lz nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.tar.xz nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.tar.zst nixpkgs-d5d8b3514d64fcd4022186795f604ec3f360ae17.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix')
| -rw-r--r-- | pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix | 4 |
1 files 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 |