diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-07 06:23:02 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-07 06:23:02 -0500 |
| commit | 47116c2d5c21ca834c5539fb1cae6815fa0063cd (patch) | |
| tree | e098e7b3f4cc338876af107b105b500d1114cd16 /pkgs | |
| parent | 8f54d931cd1475b055a8d6d8278f017cb8b72e5f (diff) | |
| download | nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.tar nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.tar.gz nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.tar.bz2 nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.tar.lz nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.tar.xz nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.tar.zst nixlib-47116c2d5c21ca834c5539fb1cae6815fa0063cd.zip | |
openjdk bootstrap: Fix rpath fixup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/openjdk/bootstrap.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 38171c4d3fef..668ca552adf1 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -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:$LIBDIRS" "$elf" || true + patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" "$elf" || true done # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: |