diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-20 00:02:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-20 00:02:29 +0000 |
| commit | f6a4c6f91221c4925fcfd28071982e82f656693a (patch) | |
| tree | 537b5fee5cfb49b007326633cd79765ead21c607 /pkgs/build-support/cc-wrapper | |
| parent | b34f222b02e543f256df511236a01feadea13c45 (diff) | |
| parent | 174bd27ec81df6d6deccd7da05f3b10c3f7a93f4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b4104f351cae7..c7c733a427aa6 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -197,7 +197,7 @@ stdenv.mkDerivation { # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit cc libc nativeTools nativeLibc nativePrefix isGNU isClang; + inherit cc libc libcxx nativeTools nativeLibc nativePrefix isGNU isClang; emacsBufferSetup = pkgs: '' ; We should handle propagation here too |