diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 0ba7a1d209ec0..8a814e9558de4 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,15 +1,10 @@ { stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }: -let version = "10.12"; in - -# Ensure appleSdkVersion is up to date. -assert stdenv.isDarwin -> stdenv.appleSdkVersion == version; - let # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; - inherit version; + version = "10.12"; # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by: # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ecec2903b5f76..30c38168fd1e9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ { lib , localSystem, crossSystem, config, overlays, crossOverlays ? [] -# The version of darwin.apple_sdk used for sources provided by apple. -, appleSdkVersion ? "10.12" # Minimum required macOS version, used both for compatibility as well as reproducability. , macosVersionMin ? "10.12" # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools @@ -150,7 +148,7 @@ in rec { __extraImpureHostDeps = commonImpureHostDeps; extraAttrs = { - inherit macosVersionMin appleSdkVersion platform; + inherit macosVersionMin platform; }; overrides = self: super: (overrides self super) // { inherit ccNoLibcxx; @@ -524,7 +522,7 @@ in rec { extraAttrs = { libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; - inherit macosVersionMin appleSdkVersion platform bootstrapTools; + inherit macosVersionMin platform bootstrapTools; }; allowedRequisites = (with pkgs; [ |