diff options
| author | John Ericson <git@JohnEricson.me> | 2021-04-22 01:05:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 01:05:22 -0400 |
| commit | fce51c84574b3a17f0cc53792189aeff4abc5663 (patch) | |
| tree | 62768cede59f08008d3c3371216c5603ca7bea75 /pkgs/stdenv | |
| parent | 43c27a4f44deefffb0f141fc6ced1fefda8640af (diff) | |
| parent | 0a8784d5dbe051a6924d082b094e0b1d98209042 (diff) | |
| download | nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.tar nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.tar.gz nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.tar.bz2 nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.tar.lz nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.tar.xz nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.tar.zst nixpkgs-fce51c84574b3a17f0cc53792189aeff4abc5663.zip | |
Merge pull request #120080 from Radvendii/cc-wrapper-lib
stdenv/{native,nix}: add lib to cc-wrapper argsDiffstat (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 b79b81253ad..010b4141e87 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 a8311f49609..2fb19992bc1 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; |