From 0310f2fa161a85ddb2f9eb4a2ecad7ba556a30bb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 7 Jun 2022 16:01:28 -0400 Subject: [PATCH] apple_sdk_11_0: expose 11.0 sdk stdenv as an attribute (cherry picked from commit 4741402) --- .../darwin/apple-sdk-11.0/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 44b119e1a23e..96ef3831c95d 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -1,4 +1,5 @@ { stdenvNoCC, fetchurl, newScope, pkgs +, stdenv, overrideCC , xar, cpio, python3, pbzx }: let @@ -54,5 +55,21 @@ let # questionable aliases configd = pkgs.darwin.apple_sdk.frameworks.SystemConfiguration; IOKit = pkgs.darwin.apple_sdk.frameworks.IOKit; + + stdenv = + let + clang = stdenv.cc.override { + bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; }; + libc = packages.Libsystem; + }; + in + if stdenv.isAarch64 then stdenv + else + (overrideCC stdenv clang).override { + targetPlatform = stdenv.targetPlatform // { + darwinMinVersion = "10.12"; + darwinSdkVersion = "11.0"; + }; + }; }; in packages