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

stdenv: Remove stdenv.platform

Changed files
+5 -10
pkgs
stdenv
darwin
linux
+3 -3
pkgs/stdenv/darwin/default.nix
···
assert crossSystem == localSystem;
let
-
inherit (localSystem) system platform;
bootstrapClangVersion = "7.1.0";
···
__extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = {
-
inherit macosVersionMin platform;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
···
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
-
inherit macosVersionMin platform bootstrapTools;
};
allowedRequisites = (with pkgs; [
···
assert crossSystem == localSystem;
let
+
inherit (localSystem) system;
bootstrapClangVersion = "7.1.0";
···
__extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = {
+
inherit macosVersionMin;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
···
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
+
inherit macosVersionMin bootstrapTools;
};
allowedRequisites = (with pkgs; [
+2 -7
pkgs/stdenv/linux/default.nix
···
assert crossSystem == localSystem;
let
-
inherit (localSystem) system platform;
commonPreHook =
''
···
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; };
};
···
# TODO: remove this!
inherit (prevStage) glibc;
-
inherit platform bootstrapTools;
shellPackage = prevStage.bash;
};
···
assert crossSystem == localSystem;
let
+
inherit (localSystem) system;
commonPreHook =
''
···
stdenvNoCC = prevStage.ccWrapperStdenv;
};
overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
};
···
# TODO: remove this!
inherit (prevStage) glibc;
+
inherit bootstrapTools;
shellPackage = prevStage.bash;
};