diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-22 06:05:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 06:05:51 +0000 |
| commit | 8248f4db3697e04e0ca5c908554337e87793f24b (patch) | |
| tree | 6d0f719128c7c0a31b48bce9ad4f1a27840798c1 /pkgs/stdenv | |
| parent | 77694c34c6265f898ea8aea639c8bd1eaa4d4c96 (diff) | |
| parent | 093b406afc29f9108949d264c11db413cd48faea (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index b79b81253ad52..010b4141e8762 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -129,7 +129,7 @@ in name = "cc-native"; nativeTools = true; nativeLibc = true; - inherit nativePrefix; + inherit lib nativePrefix; bintools = import ../../build-support/bintools-wrapper { name = "bintools"; inherit stdenvNoCC nativePrefix; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index a8311f49609aa..2fb19992bc1ef 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -24,6 +24,7 @@ bootStages ++ [ initialPath = (import ../common-path.nix) { pkgs = prevStage; }; cc = import ../../build-support/cc-wrapper { + inherit lib; nativeTools = false; nativePrefix = lib.optionalString hostPlatform.isSunOS "/usr"; nativeLibc = true; |