Skip to content

Commit 961aa92

Browse files
committed
julia: set USE_SYSTEM_ZLIB
Bundled libunwind still uses system zlib even without USE_SYSTEM_ZLIB set, so instead make all libraries use system zlib Reference: JuliaLang/julia#55354
1 parent ff3dfa0 commit 961aa92

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

pkgs/development/compilers/julia/generic.nix

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ stdenv.mkDerivation rec {
6161
makeFlags = [
6262
"prefix=$(out)"
6363
"USE_BINARYBUILDER=0"
64+
] ++ lib.optionals (lib.versions.majorMinor version == "1.10") [
65+
"USE_SYSTEM_ZLIB=1"
6466
] ++ lib.optionals stdenv.hostPlatform.isx86_64 [
6567
# https://github.com/JuliaCI/julia-buildkite/blob/main/utilities/build_envs.sh
6668
"JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1);x86-64-v4,-rdrnd,base(1)"

pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ index 88dbe5b2b4..a2a7a55e20 100644
1616
$(TESTS):
1717
@cd $(SRCDIR) && \
1818
- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
19-
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall $@)
19+
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall Zlib_jll $@)
2020

2121
$(addprefix revise-, $(TESTS)): revise-% :
2222
@cd $(SRCDIR) && \

0 commit comments

Comments
 (0)