public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110726 from Ericson2314/no-stdenv-dot-platform 

stdenv: Remove stdenv.platform
This commit is contained in:
John Ericson 2021-01-24 21:31:35 -05:00 committed by GitHub
parent afebf1cc9a fa204a97d8
commit e8d39a93c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
assert crossSystem == localSystem; assert crossSystem == localSystem;
let let
inherit (localSystem) system platform; inherit (localSystem) system;
bootstrapClangVersion = "7.1.0"; bootstrapClangVersion = "7.1.0";
@ -148,7 +148,7 @@ in rec {
__extraImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = { extraAttrs = {
inherit macosVersionMin platform; inherit macosVersionMin;
}; };
overrides = self: super: (overrides self super) // { overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx; inherit ccNoLibcxx;
@ -522,7 +522,7 @@ in rec {
extraAttrs = { extraAttrs = {
libc = pkgs.darwin.Libsystem; libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash; shellPackage = pkgs.bash;
inherit macosVersionMin platform bootstrapTools; inherit macosVersionMin bootstrapTools;
}; };
allowedRequisites = (with pkgs; [ allowedRequisites = (with pkgs; [

9
pkgs/stdenv/linux/default.nix
View File

@ -42,7 +42,7 @@
assert crossSystem == localSystem; assert crossSystem == localSystem;
let let
inherit (localSystem) system platform; inherit (localSystem) system;
commonPreHook = commonPreHook =
'' ''
@ -111,11 +111,6 @@ let
stdenvNoCC = prevStage.ccWrapperStdenv; stdenvNoCC = prevStage.ccWrapperStdenv;
}; };
extraAttrs = {
# Having the proper 'platform' in all the stdenvs allows getting proper
# linuxHeaders for example.
inherit platform;
};
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
}; };
@ -369,7 +364,7 @@ in
# TODO: remove this! # TODO: remove this!
inherit (prevStage) glibc; inherit (prevStage) glibc;
inherit platform bootstrapTools; inherit bootstrapTools;
shellPackage = prevStage.bash; shellPackage = prevStage.bash;
}; };