diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 10:02:59 +0700 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2021-01-24 19:07:54 -0800 |
| commit | aa8868c7cca8d30706a68a876d048968c83e1cf1 (patch) | |
| tree | 0b691e6a879790086c7abb789e2f63ef4bad5950 /pkgs/stdenv | |
| parent | e8d39a93c2950d2e3d69e52fdc10f6827ca3970b (diff) | |
| download | nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.gz nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.bz2 nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.lz nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.xz nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.zst nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.zip | |
pkgs/build-support: stdenv.lib -> lib
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6e1967281b3..3e5c46709ac 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -80,7 +80,7 @@ in rec { mkCC = overrides: import ../../build-support/cc-wrapper ( let args = { - inherit shell; + inherit lib shell; inherit (last) stdenvNoCC; nativeTools = false; @@ -217,6 +217,7 @@ in rec { binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) { shell = "${bootstrapTools}/bin/bash"; + inherit lib; inherit (self) stdenvNoCC; nativeTools = false; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index b36eb1b5742..f753af49926 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -107,6 +107,7 @@ let bintools = prevStage.binutils; isGNU = true; libc = getLibc prevStage; + inherit lib; inherit (prevStage) coreutils gnugrep; stdenvNoCC = prevStage.ccWrapperStdenv; }; @@ -166,6 +167,7 @@ in nativeLibc = false; buildPackages = { }; libc = getLibc self; + inherit lib; inherit (self) stdenvNoCC coreutils gnugrep; bintools = bootstrapTools; }; @@ -312,6 +314,7 @@ in cc = prevStage.gcc-unwrapped; bintools = self.binutils; libc = getLibc self; + inherit lib; inherit (self) stdenvNoCC coreutils gnugrep; shell = self.bash + "/bin/bash"; }; |