Skip to content

Commit 1a64d1a

Browse files
committed
include dependencies into LSP commands
1 parent 3609928 commit 1a64d1a

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

develop.nix

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,21 @@ includeos.pkgs.mkShell.override { inherit (includeos) stdenv; } rec {
7272
-D ARCH=${arch} \
7373
-D CMAKE_MODULE_PATH=${includeos}/cmake
7474
75+
# TODO: missing s2n-tls (postponed in overlay.nix)
76+
DEP_INCLUDE_PATH="$(
77+
for d in \
78+
"$IOS_SRC/test/lest_util" \
79+
"${includeos.botan2.include}" \
80+
"${includeos.http-parser.include}" \
81+
"${includeos.lest.include}" \
82+
"${includeos.uzlib.include}" \
83+
"${includeos.pkgs.rapidjson}/include" \
84+
"${includeos.pkgs.openssl}/include"
85+
do
86+
printf ' -I %s' "$d"
87+
done
88+
)"
89+
7590
# procuced by CMake
7691
CCDB="${buildpath}/compile_commands.json"
7792
@@ -83,13 +98,13 @@ includeos.pkgs.mkShell.override { inherit (includeos) stdenv; } rec {
8398
jq \
8499
--arg libcxx "${includeos.libraries.libcxx.include}" \
85100
--arg libc "${includeos.libraries.libc}" \
86-
--arg libfmt "${includeos.passthru.libfmt.include}" \
87101
--arg localsrc "${toString ./.}" \
102+
--arg extra "$DEP_INCLUDE_PATH" \
88103
'
89104
map(.command |= ( .
90105
+ " -isystem \($libcxx)"
91106
+ " -isystem \($libc)/include"
92-
+ " -I \($libfmt)"
107+
+ " \($extra)"
93108
| gsub("(?<a>-I)(?<b>/lib/LiveUpdate/include)"; .a + $localsrc + .b)
94109
))
95110
' "$CCDB" > "$tmp" && mv "$tmp" "$CCDB"

0 commit comments

Comments
 (0)