Merge release-21.05 into staging-next-21.05

2021-07-11 18:03:22 +00:00
parent c1f5dd7be2 f130eb0777
commit 597a6aad6d
1 changed files with 1 additions and 1 deletions
--- a/pkgs/development/tools/misc/ccls/wrapper
+++ b/pkgs/development/tools/misc/ccls/wrapper
@@ -4,6 +4,6 @@ printf -v extraArgs ',\"%s\"' \
  $(cat @clang@/nix-support/libc-cflags \
        @clang@/nix-support/libcxx-cxxflags) \
  ${NIX_CFLAGS_COMPILE}
-initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}"
+initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}"

 exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"