diff options
| author | Nikodem Rabuliński <nikodem@rabulinski.com> | 2024-05-07 21:26:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-07 21:26:24 +0000 |
| commit | e8a603fb2f6418307c3521785b3c8d73396792d8 (patch) | |
| tree | b3f9f854b8bc48d0b89d4bab106be88320c6ef26 /package.nix | |
| parent | 964ac8b0e88fb5789b87e33273e42363958d0afb (diff) | |
| parent | f894cce79b05913891c8356948b5fc468a53c198 (diff) | |
Merge changes Icf26010a,Ib6161567 into main
* changes:
Always initialize curl in parent process on darwin
Fix failing darwin tests
Diffstat (limited to 'package.nix')
| -rw-r--r-- | package.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/package.nix b/package.nix index dbdc66340..4abce3aad 100644 --- a/package.nix +++ b/package.nix @@ -398,10 +398,6 @@ stdenv.mkDerivation (finalAttrs: { mesonInstallCheckFlags = [ "--suite=installcheck" ]; - preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - ''; - installCheckPhase = lib.optionalString buildWithMeson '' runHook preInstallCheck flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}") |