mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-13 01:36:15 +02:00
Merge pull request #10164 from hercules-ci/objc-workaround
package.nix: Apply OBJC_DISABLE_INITIALIZE_FORK_SAFETY workaround
This commit is contained in:
commit
c4cfa18a33
1 changed files with 9 additions and 3 deletions
12
package.nix
12
package.nix
|
@ -349,9 +349,15 @@ in {
|
||||||
|
|
||||||
# Needed for tests if we are not doing a build, but testing existing
|
# Needed for tests if we are not doing a build, but testing existing
|
||||||
# built Nix.
|
# built Nix.
|
||||||
preInstallCheck = lib.optionalString (! doBuild) ''
|
preInstallCheck =
|
||||||
mkdir -p src/nix-channel
|
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;
|
separateDebugInfo = !stdenv.hostPlatform.isStatic;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue