From bdb531f6af5ecf3e73849826d968177ed6ad4bb0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 29 Mar 2018 17:43:42 -0500 Subject: openjdk/bootstrap: add zlib to bootstrap JDK RPATH ./bin/java now apparently requires zlib.so, otherwise the whole thing is busted. This is even required in the minimal configuration. Unfortunately this impiles a rebuild of *all* OpenJDK packages and their downstream dependencies. Signed-off-by: Austin Seipp --- pkgs/development/compilers/openjdk/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 668ca552adf1..884e8eb886ed 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv -, runCommand, fetchurl, file +, runCommand, fetchurl, file, zlib , version }: @@ -45,7 +45,7 @@ let find "$out" -type f -print0 | while IFS= read -r -d "" elf; do isELF "$elf" || continue patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true - patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true + patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true done # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: -- cgit 1.4.1