ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

darwin.apple-sdk: drop appleSdkVersion

Browse Source 
In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
This commit is contained in:
Monson Shao 2021-01-20 18:37:56 +08:00
parent a884b21822
commit 2467f5e4d2
No known key found for this signature in database
GPG Key ID: 163271C707982C65
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -1,15 +1,10 @@
{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }: { 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 let
# sadly needs to be exported because security_tool needs it # sadly needs to be exported because security_tool needs it
sdk = stdenv.mkDerivation rec { sdk = stdenv.mkDerivation rec {
pname = "MacOS_SDK"; 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: # 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 # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version

6
pkgs/stdenv/darwin/default.nix
View File

@ -1,7 +1,5 @@
{ lib { lib
, localSystem, crossSystem, config, overlays, crossOverlays ? [] , 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. # Minimum required macOS version, used both for compatibility as well as reproducability.
, macosVersionMin ? "10.12" , macosVersionMin ? "10.12"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools # 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; __extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = { extraAttrs = {
inherit macosVersionMin appleSdkVersion platform; inherit macosVersionMin platform;
}; };
overrides = self: super: (overrides self super) // { overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx; inherit ccNoLibcxx;
@ -524,7 +522,7 @@ in rec {
extraAttrs = { extraAttrs = {
libc = pkgs.darwin.Libsystem; libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash; shellPackage = pkgs.bash;
inherit macosVersionMin appleSdkVersion platform bootstrapTools; inherit macosVersionMin platform bootstrapTools;
}; };
allowedRequisites = (with pkgs; [ allowedRequisites = (with pkgs; [