From fa204a97d8e0b1256483528350b743fddcedb207 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 24 Jan 2021 22:51:12 +0000 Subject: [PATCH] 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.) --- pkgs/stdenv/darwin/default.nix | 6 +++--- pkgs/stdenv/linux/default.nix | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 30c38168fd1..6e1967281b3 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -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; [ diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6d6bca870bf..b36eb1b5742 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; };