Skip to content

Commit

Permalink
Merge pull request #10164 from hercules-ci/objc-workaround
Browse files Browse the repository at this point in the history
package.nix: Apply OBJC_DISABLE_INITIALIZE_FORK_SAFETY workaround
  • Loading branch information
thufschmitt committed Mar 7, 2024
2 parents 16fa5aa + 2a34510 commit c4cfa18
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,15 @@ in {

# Needed for tests if we are not doing a build, but testing existing
# built Nix.
preInstallCheck = lib.optionalString (! doBuild) ''
mkdir -p src/nix-channel
'';
preInstallCheck =
lib.optionalString (! doBuild) ''
mkdir -p src/nix-channel
''
# See https://github.com/NixOS/nix/issues/2523
# Occurs often in tests since https://github.com/NixOS/nix/pull/9900
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
'';

separateDebugInfo = !stdenv.hostPlatform.isStatic;

Expand Down

0 comments on commit c4cfa18

Please sign in to comment.