diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-03-29 17:43:42 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-04-01 15:18:47 -0500 |
| commit | bdb531f6af5ecf3e73849826d968177ed6ad4bb0 (patch) | |
| tree | 3f0f55929e698406bf8a3f74a2731c96f3385e6d | |
| parent | 5f7cad19a893b9bd9ed38c66d8bbacb01e22d743 (diff) | |
| download | nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.tar nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.tar.gz nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.tar.bz2 nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.tar.lz nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.tar.xz nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.tar.zst nixlib-bdb531f6af5ecf3e73849826d968177ed6ad4bb0.zip | |
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 <aseipp@pobox.com>
| -rw-r--r-- | pkgs/development/compilers/openjdk/bootstrap.nix | 4 |
1 files 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: |