diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-24 16:49:40 +0300 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-24 16:49:40 +0300 |
commit | 3d29de1f5b790d2074f93ae1ffceb1f01c91dece (patch) | |
tree | 6309932aa288d363455e69039c33e4be995b6b74 /pkgs/os-specific/darwin/apple-sdk-11.0 | |
parent | 2c070763c74ca131e58d9d6762690c79170cda48 (diff) | |
download | nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.tar nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.tar.gz nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.tar.bz2 nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.tar.lz nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.tar.xz nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.tar.zst nixpkgs-3d29de1f5b790d2074f93ae1ffceb1f01c91dece.zip |
darwin.apple_sdk_11_0: add mkCc
Diffstat (limited to 'pkgs/os-specific/darwin/apple-sdk-11.0')
-rw-r--r-- | pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 4f457860fee..2576d8bcafb 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -50,16 +50,18 @@ let ''; }; - mkStdenv = stdenv: - let - cc = stdenv.cc.override { + mkCc = cc: + if stdenv.isAarch64 then cc + else + cc.override { bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; libc = packages.Libsystem; }; - in + + mkStdenv = stdenv: if stdenv.isAarch64 then stdenv else - (overrideCC stdenv cc).override { + (overrideCC stdenv (mkCc stdenv.cc)).override { targetPlatform = stdenv.targetPlatform // { darwinMinVersion = "10.12"; darwinSdkVersion = "11.0"; @@ -108,10 +110,7 @@ let inherit (pkgs.callPackage ../../../build-support/rust/hooks { inherit (pkgs.darwin.apple_sdk_11_0) stdenv; inherit (pkgs) cargo rustc; - clang = pkgs.clang.override { - bintools = pkgs.clang.bintools.override { libc = packages.Libsystem; }; - libc = packages.Libsystem; - }; + clang = mkCc pkgs.clang; }) bindgenHook; }; |