From 721c129d43c5e8c4c26dae7db398b66705eec7b5 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 22 Jan 2021 17:39:58 +0900 Subject: [PATCH] bintools-wrapper: remove reference to removed appleSdkVersion Also use matching attribute for `-macosx_version_min`. See https://github.com/NixOS/nixpkgs/pull/110140 --- pkgs/build-support/bintools-wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 22ff83f18fe3f..ad3cff7bf849e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -259,9 +259,9 @@ stdenv.mkDerivation { # building. However it seems to be essential on aarch64-darwin and # required for bootstrapping. optionals stdenv.targetPlatform.isAarch64 [ - "-macosx_version_min ${stdenv.minSdkVersion or "10.12"}" + "-macosx_version_min ${stdenv.macosVersionMin or "10.12"}" ] ++ - [ "-sdk_version ${stdenv.appleSdkVersion or "10.12"}" ] ++ + [ "-sdk_version ${if stdenv.targetPlatform.isAarch64 then "10.16" else "10.12"}" ] ++ # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. [ "-no_uuid" ]; in ''