Skip to content

Commit b236af7

Browse files
committed
include dependencies into LSP commands
1 parent bb9ff03 commit b236af7

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

develop.nix

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,22 @@ 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+
# TODO: missing libfdt (no default.nix target)
77+
DEP_INCLUDE_PATH="$(
78+
for d in \
79+
"$IOS_SRC/test/lest_util" \
80+
"${includeos.botan2.include}" \
81+
"${includeos.http-parser.include}" \
82+
"${includeos.lest.include}" \
83+
"${includeos.uzlib.include}" \
84+
"${includeos.pkgs.rapidjson}/include" \
85+
"${includeos.pkgs.openssl}/include"
86+
do
87+
printf ' -I %s' "$d"
88+
done
89+
)"
90+
7591
# procuced by CMake
7692
CCDB="${buildpath}/compile_commands.json"
7793
@@ -83,11 +99,13 @@ includeos.pkgs.mkShell.override { inherit (includeos) stdenv; } rec {
8399
jq \
84100
--arg libcxx "${includeos.libraries.libcxx.include}" \
85101
--arg libc "${includeos.libraries.libc}" \
86-
--arg localsrc "${toString ./.}" \
102+
--arg localsrc "${toString ./.}" \
103+
--arg extra "$DEP_INCLUDE_PATH" \
87104
'
88105
map(.command |= ( .
89106
+ " -isystem \($libcxx)"
90107
+ " -isystem \($libc)/include"
108+
+ " \($extra)"
91109
| gsub("(?<a>-I)(?<b>/lib/LiveUpdate/include)"; .a + $localsrc + .b)
92110
))
93111
' "$CCDB" > "$tmp" && mv "$tmp" "$CCDB"

0 commit comments

Comments
 (0)