Skip to content

Commit 86460e0

Browse files
committed
tools: move Quic dependencies behind ad-hoc flag
Quic is now behind `--experimental-quic` build flag, its dependencies should be included only if the user opts-in.
1 parent 77e8d44 commit 86460e0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

shell.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
# Build options
1414
icu ? pkgs.icu,
1515
withAmaro ? true,
16+
withQuic ? false,
1617
withSQLite ? true,
1718
withSSL ? true,
1819
withTemporal ? false,
1920
sharedLibDeps ? import ./tools/nix/sharedLibDeps.nix {
2021
inherit
2122
pkgs
23+
withQuic
2224
withSQLite
2325
withSSL
2426
withTemporal
@@ -81,6 +83,7 @@ pkgs.mkShell {
8183
]
8284
++ extraConfigFlags
8385
++ pkgs.lib.optional (!withAmaro) "--without-amaro"
86+
++ pkgs.lib.optional withQuic "--experimental-quic"
8487
++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
8588
++ pkgs.lib.optional (!withSSL) "--without-ssl"
8689
++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support"

tools/nix/sharedLibDeps.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
pkgs ? import ./pkgs.nix { },
3+
withQuic ? false,
34
withSQLite ? true,
45
withSSL ? true,
56
withTemporal ? false,
@@ -12,8 +13,6 @@
1213
gtest
1314
libuv
1415
nbytes
15-
nghttp3
16-
ngtcp2
1716
simdjson
1817
simdutf
1918
uvwasi
@@ -33,6 +32,12 @@
3332
];
3433
};
3534
}
35+
// (pkgs.lib.optionalAttrs withQuic {
36+
inherit (pkgs)
37+
nghttp3
38+
ngtcp2
39+
;
40+
})
3641
// (pkgs.lib.optionalAttrs withSQLite {
3742
inherit (pkgs) sqlite;
3843
})

0 commit comments

Comments
 (0)