nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

openjdk8: use lndir instead of single symlink to JRE

Browse Source 
Directly symlinking from the JDK to the JRE confused Gradle and made it try to
find JDK files inside the JRE.

(cherry picked from commit 1621cbe270)
This commit is contained in:
Ben Wolsieffer
2019-09-10 14:23:38 -04:00
committed by Linus Heckemann
parent 09e958675c
commit 35751608ba
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/openjdk/8.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
, openjdk8-bootstrap
@@ -85,7 +85,7 @@ let
outputs = [ "out" "jre" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig lndir ];
buildInputs = [
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
@@ -190,7 +190,8 @@ let
# Move the JRE to a separate output
mkdir -p $jre/lib/openjdk
mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
mkdir $out/lib/openjdk/jre
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
# Setup fallback fonts
${lib.optionalString (!headless) ''