Skip to content

Commit b27df9c

Browse files
committed
fixup! tools: enable temporal by default in Nix integration
1 parent 0df53d3 commit b27df9c

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

‎tools/nix/v8.nix‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ let
2929
useSharedSimdutf = builtins.elem "--shared-simdutf" configureFlags;
3030
useSharedTemporal = builtins.elem "--shared-temporal_capi" configureFlags;
3131

32-
useVendoredPerfetto = builtins.elem "--with-perfetto" configureFlags && !useSharedPerfetto;
33-
isTemporalDisabled = builtins.elem "--v8-disable-temporal-support" configureFlags;
34-
3532
src =
3633
let
3734
inherit (lib) fileset;
@@ -55,8 +52,13 @@ let
5552
++ lib.optional (!useSharedAbseil) ../../tools/v8_gypfiles/abseil.gyp
5653
++ lib.optional (!useSharedHighway) ../../tools/v8_gypfiles/highway.gyp
5754
++ lib.optional (!useSharedSimdutf) ../../tools/v8_gypfiles/simdutf.gyp
58-
++ lib.optional useVendoredPerfetto ../../deps/perfetto
59-
++ lib.optional (if useSharedTemporal then icu == null else !isTemporalDisabled) ../../deps/crates
55+
++ lib.optional (
56+
(useSharedTemporal && icu == null)
57+
|| !(builtins.elem "--v8-disable-temporal-support" configureFlags)
58+
) ../../deps/crates
59+
++ lib.optional (
60+
builtins.elem "--with-perfetto" configureFlags && !useSharedPerfetto
61+
) ../../deps/perfetto
6062
++ lib.optionals (icu != null) [
6163
../../tools/icu/icu_versions.json
6264
../../tools/icu/icu-system.gyp

0 commit comments

Comments
 (0)