mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

stdenv: Remove stdenv.platform

Browse source 
This was not working after #110544 as caught by @r-burns in
https://github.com/NixOS/nixpkgs/pull/110544#issuecomment-766444647.
Thankfully it isn't used anymore and I believe wasn't documented either.
(I at least did not remember it existed.)
This commit is contained in:
John Ericson 2021-01-24 22:51:12 +00:00
parent ebf40134f4
commit fa204a97d8
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;
let
inherit (localSystem) system platform;
inherit (localSystem) system;
bootstrapClangVersion = "7.1.0";
@ -148,7 +148,7 @@ in rec {
__extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = {
inherit macosVersionMin platform;
inherit macosVersionMin;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
@ -522,7 +522,7 @@ in rec {
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
inherit macosVersionMin platform bootstrapTools;
inherit macosVersionMin bootstrapTools;
};
allowedRequisites = (with pkgs; [

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

@ -42,7 +42,7 @@
assert crossSystem == localSystem;
let
inherit (localSystem) system platform;
inherit (localSystem) system;
commonPreHook =
''
@ -111,11 +111,6 @@ let
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; };
};
@ -369,7 +364,7 @@ in
# TODO: remove this!
inherit (prevStage) glibc;
inherit platform bootstrapTools;
inherit bootstrapTools;
shellPackage = prevStage.bash;
};