diff options
| author | Michael Livshin <repo@cmm.kakpryg.net> | 2021-06-13 16:07:49 +0300 |
|---|---|---|
| committer | Michael Livshin <repo@cmm.kakpryg.net> | 2021-06-13 17:57:42 +0300 |
| commit | 37d81fb867e2d3bae95b7ca058ac56b1a4c22392 (patch) | |
| tree | c77712f43bce10806af2767897450ed5fd05db2c | |
| parent | Merge pull request #126740 from NixOS/backport-126662-to-release-21.05 (diff) | |
| download | nixpkgs-37d81fb867e2d3bae95b7ca058ac56b1a4c22392.tar.gz | |
clang-tools: fix clangd
Whatever change has necessitated
https://github.com/NixOS/nixpkgs/pull/122044, it also broke clangd --
<clang-wrapper>/resource-root/include is no longer automagically
searched for includes, which kills pretty much any indexing since that
directory contains vital stuff like stddef.h etc.
Fix by appending the directory to CPATH & CPLUS_INCLUDE_PATH in the
clangd wrapper.
(cherry picked from commit 8e06a39574aeb6500ad233e3b529e0e43fb80788)
| -rwxr-xr-x | pkgs/development/tools/clang-tools/wrapper | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/clang-tools/wrapper b/pkgs/development/tools/clang-tools/wrapper index eebc152d11b1..1008023fdc0d 100755 --- a/pkgs/development/tools/clang-tools/wrapper +++ b/pkgs/development/tools/clang-tools/wrapper @@ -19,9 +19,9 @@ buildcpath() { } export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ $(<@clang@/nix-support/libcxx-cxxflags) \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include exec -a "$0" @unwrapped@/bin/$(basename $0) "$@" |