From 28fe4eec0fc391a6286fec45cdb11655824e1ab3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 23 May 2023 22:00:43 -0400 Subject: [PATCH] apple_sdk_11_0.stdenv: replace extraBuildInputs with CF from 11.0 SDK This can result in swift-corefoundation being included even when a derivation uses `apple_sdk_11_0.stdenv` directly, which may result in hard to debug compiler errors (unless you just happen to know cryptic compiler errors means the 10.12 and 11.0 SDKs have been mixed). --- pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 1 + 1 file changed, 1 insertion(+) 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 741c1a82f3475..fca574bb8c181 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -62,6 +62,7 @@ let if stdenv.isAarch64 then stdenv else (overrideCC stdenv (mkCc stdenv.cc)).override { + extraBuildInputs = [ pkgs.darwin.apple_sdk_11_0.frameworks.CoreFoundation ]; targetPlatform = stdenv.targetPlatform // { darwinMinVersion = "10.12"; darwinSdkVersion = "11.0";