From 8e06a39574aeb6500ad233e3b529e0e43fb80788 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Sun, 13 Jun 2021 16:07:49 +0300 Subject: [PATCH] clang-tools: fix clangd Whatever change has necessitated https://github.com/NixOS/nixpkgs/pull/122044, it also broke clangd -- /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. --- pkgs/development/tools/clang-tools/wrapper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clang-tools/wrapper b/pkgs/development/tools/clang-tools/wrapper index eebc152d11b..1008023fdc0 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) "$@"