diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-02-18 19:44:44 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-04-12 22:08:36 +0200 |
| commit | a7dbdb7644ec27782b35a8dc07e3b0070c5232ed (patch) | |
| tree | bcf5bcf86f0aecb3cb682bbe1f7c3cf892ad9c90 /pkgs/build-support/cc-wrapper/default.nix | |
| parent | b0ee79f9fdddb40a2bceb34c2578b349aa09425e (diff) | |
| download | nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.tar nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.tar.gz nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.tar.bz2 nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.tar.lz nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.tar.xz nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.tar.zst nixpkgs-a7dbdb7644ec27782b35a8dc07e3b0070c5232ed.zip | |
cc-wrapper: don't set env to null when nativeTools is used
This is not allowed and fails fatal
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6520c04f5e8..c614fe0d287 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -550,8 +550,11 @@ stdenv.mkDerivation { expandResponseParams = "${expand-response-params}/bin/expand-response-params"; shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; + # stdenv.cc.cc should not be null and we have nothing better for now. + # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again. + cc = if nativeTools then "" else cc; wrapperName = "CC_WRAPPER"; - inherit suffixSalt coreutils_bin bintools cc; + inherit suffixSalt coreutils_bin bintools; inherit libc_bin libc_dev libc_lib; inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; }; |