openjdk8: use lndir instead of single symlink to JRE
Directly symlinking from the JDK to the JRE confused Gradle and made it try to find JDK files inside the JRE.
This commit is contained in:
parent
aa6c38d9c1
commit
72f76fe856
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
|
{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
|
||||||
, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
|
, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
|
||||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
|
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
|
||||||
, libjpeg, giflib
|
, libjpeg, giflib
|
||||||
, openjdk8-bootstrap
|
, openjdk8-bootstrap
|
||||||
|
@ -85,7 +85,7 @@ let
|
||||||
|
|
||||||
outputs = [ "out" "jre" ];
|
outputs = [ "out" "jre" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig lndir ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
|
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
|
||||||
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
|
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
|
||||||
|
@ -190,7 +190,8 @@ let
|
||||||
# Move the JRE to a separate output
|
# Move the JRE to a separate output
|
||||||
mkdir -p $jre/lib/openjdk
|
mkdir -p $jre/lib/openjdk
|
||||||
mv $out/lib/openjdk/jre $jre/lib/openjdk/jre
|
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
|
# Setup fallback fonts
|
||||||
${lib.optionalString (!headless) ''
|
${lib.optionalString (!headless) ''
|
||||||
|
|
Loading…
Reference in a new issue