Skip to content

Commit 150d154

Browse files
authored
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. PR-URL: #61446 Refs: 853277a Reviewed-By: Chengzhong Wu <[email protected]>
1 parent c585e69 commit 150d154

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
@@ -12,12 +12,14 @@
1212
# Build options
1313
icu ? pkgs.icu,
1414
withAmaro ? true,
15+
withQuic ? false,
1516
withSQLite ? true,
1617
withSSL ? true,
1718
withTemporal ? false,
1819
sharedLibDeps ? import ./tools/nix/sharedLibDeps.nix {
1920
inherit
2021
pkgs
22+
withQuic
2123
withSQLite
2224
withSSL
2325
withTemporal
@@ -80,6 +82,7 @@ pkgs.mkShell {
8082
]
8183
++ extraConfigFlags
8284
++ pkgs.lib.optional (!withAmaro) "--without-amaro"
85+
++ pkgs.lib.optional withQuic "--experimental-quic"
8386
++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
8487
++ pkgs.lib.optional (!withSSL) "--without-ssl"
8588
++ 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,
@@ -11,8 +12,6 @@
1112
gtest
1213
libuv
1314
nbytes
14-
nghttp3
15-
ngtcp2
1615
simdjson
1716
simdutf
1817
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)