diff options
| author | K900 <me@0upti.me> | 2023-11-04 15:05:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 15:05:44 +0300 |
| commit | 7d2381f73b5ac1a5fda3d78c0b080e5054571cdf (patch) | |
| tree | da00a38b7632a8c46b32b173e81598f44f580968 /pkgs/stdenv | |
| parent | d0a608519bca1bd2235e3aa21d6e869559078e40 (diff) | |
| parent | b5979d3f608dbf01165ed8d21df0978fdb3cdd62 (diff) | |
| download | nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.tar nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.tar.gz nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.tar.bz2 nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.tar.lz nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.tar.xz nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.tar.zst nixpkgs-7d2381f73b5ac1a5fda3d78c0b080e5054571cdf.zip | |
Merge pull request #265395 from reckenrode/arrow-cpp-fix
arrow-cpp: fix crash in tests on x86_64-darwin
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 977ef2eef9c..a6a2736fec1 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -262,6 +262,9 @@ rec { ) darwinMinVersion darwinSdkVersion; sdk = pkgs.darwin."apple_sdk_${lib.replaceStrings [ "." ] [ "_" ] darwinSdkVersion}"; + # TODO: Make this unconditional after #229210 has been merged, + # and the 10.12 SDK is updated to follow the new structure. + Libsystem = if darwinSdkVersion == "10.12" then pkgs.darwin.Libsystem else sdk.Libsystem; replacePropagatedFrameworks = pkg: let @@ -349,8 +352,8 @@ rec { // lib.genAttrs atBuildInputs (input: map mapRuntimeToSDK (args."${input}" or [ ])); mkCC = cc: cc.override { - bintools = cc.bintools.override { libc = sdk.Libsystem; }; - libc = sdk.Libsystem; + bintools = cc.bintools.override { libc = Libsystem; }; + libc = Libsystem; }; in # TODO: make this work across all input types and not just propagatedBuildInputs |