summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMonson Shao <holymonson@gmail.com>2021-01-20 18:37:56 +0800
committerMonson Shao <holymonson@gmail.com>2021-01-21 00:26:16 +0800
commit2467f5e4d2f3520890b7faa04a9d0d66f89a2874 (patch)
tree415fe47a1b3c05f32e51db96dc88756ea08ef0cf
parenta884b2182243cb2ec998e638c98ddfac58c2f812 (diff)
darwin.apple-sdk: drop appleSdkVersion
In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
-rw-r--r--pkgs/os-specific/darwin/apple-sdk/default.nix7
-rw-r--r--pkgs/stdenv/darwin/default.nix6
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 0ba7a1d209ec..8a814e9558de 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 ecec2903b5f7..30c38168fd1e 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; [