diff options
author | John Ericson <git@JohnEricson.me> | 2021-01-24 21:31:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-24 21:31:35 -0500 |
commit | e8d39a93c2950d2e3d69e52fdc10f6827ca3970b (patch) | |
tree | c20fd2fa14dd92987bedf42f4dd461e8512a1b45 /pkgs/stdenv | |
parent | afebf1cc9a691256018cf67bf665fb30f7178df2 (diff) | |
parent | fa204a97d8e0b1256483528350b743fddcedb207 (diff) | |
download | nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.tar nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.tar.gz nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.tar.bz2 nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.tar.lz nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.tar.xz nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.tar.zst nixpkgs-e8d39a93c2950d2e3d69e52fdc10f6827ca3970b.zip |
Merge pull request #110726 from Ericson2314/no-stdenv-dot-platform
stdenv: Remove stdenv.platform
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 6 | ||||
-rw-r--r-- | 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; }; |