diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-24 22:51:12 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-24 22:51:12 +0000 |
| commit | fa204a97d8e0b1256483528350b743fddcedb207 (patch) | |
| tree | 2ae715d3f632d453c9fe201fd45176811bac836d /pkgs/stdenv/linux | |
| parent | ebf40134f437952d6fb3f1907b4c5583b71bf792 (diff) | |
stdenv: Remove stdenv.platform
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.)
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6d6bca870bf9..b36eb1b5742a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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; }; |