b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #233815 from reckenrode/bindgenHook-fix

Browse source 
rustPlatform.bindgenHook: use the correct Libsystem on the 11.0 SDK
This commit is contained in:
Weijia Wang 2023-05-24 23:45:23 +03:00 committed by GitHub
parent 7ef1ddae9e 3d29de1f5b
commit db38340b4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View file

@ -50,16 +50,18 @@ let
''; '';
}; };
mkStdenv = stdenv: mkCc = cc:
let if stdenv.isAarch64 then cc
cc = stdenv.cc.override { else
cc.override {
bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; };
libc = packages.Libsystem; libc = packages.Libsystem;
}; };
in
mkStdenv = stdenv:
if stdenv.isAarch64 then stdenv if stdenv.isAarch64 then stdenv
else else
(overrideCC stdenv cc).override { (overrideCC stdenv (mkCc stdenv.cc)).override {
targetPlatform = stdenv.targetPlatform // { targetPlatform = stdenv.targetPlatform // {
darwinMinVersion = "10.12"; darwinMinVersion = "10.12";
darwinSdkVersion = "11.0"; darwinSdkVersion = "11.0";
@ -104,6 +106,12 @@ let
rustPlatform = pkgs.makeRustPlatform { rustPlatform = pkgs.makeRustPlatform {
inherit (pkgs.darwin.apple_sdk_11_0) stdenv; inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
inherit (pkgs) rustc cargo; inherit (pkgs) rustc cargo;
} // {
inherit (pkgs.callPackage ../../../build-support/rust/hooks {
inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
inherit (pkgs) cargo rustc;
clang = mkCc pkgs.clang;
}) bindgenHook;
}; };
callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec { callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec {