Skip to content

Commit 4560e9c

Browse files
committed
fixup! deps: use shared V8 zlib
1 parent 6f94000 commit 4560e9c

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@ def configure_v8(o, configs):
18191819
if flavor != 'linux' and options.v8_enable_hugepage:
18201820
raise Exception('--v8-enable-hugepage is supported only on linux.')
18211821
o['variables']['v8_enable_hugepage'] = 1 if options.v8_enable_hugepage else 0
1822-
o['variables']['v8_use_system_zlib'] = 1 if options.shared_zlib else 0
1822+
o['variables']['v8_use_system_zlib'] = 0
18231823
o['variables']['v8_use_system_simdutf'] = 1 if options.shared_simdutf else 0
18241824
if options.v8_enable_short_builtin_calls or o['variables']['target_arch'] == 'x64':
18251825
o['variables']['v8_enable_short_builtin_calls'] = 1

tools/nix/sharedLibDeps.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
simdutf
1414
sqlite
1515
uvwasi
16+
zlib
1617
zstd
1718
;
1819
http-parser = pkgs.llhttp;
@@ -43,11 +44,4 @@
4344
"dev"
4445
];
4546
});
46-
zlib = pkgs.zlib.overrideAttrs (old: {
47-
src = pkgs.fetchgit {
48-
url = "https://chromium.googlesource.com/chromium/src/third_party/zlib.git";
49-
rev = "85f05b0835f934e52772efc308baa80cdd491838";
50-
hash = "sha256-d01Vdo+kZ43AhES5MYGFae67fH6L6ATh3xQadMu7Hw0=";
51-
};
52-
});
5347
}

0 commit comments

Comments
 (0)