dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

adoptopenjdk: fix fontconfig dependency

Browse Source
This commit is contained in:
Ben Wolsieffer 2019-08-10 14:47:54 -04:00
parent d4e2cb08ff
commit b4480b798d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View File

@ -6,6 +6,7 @@ sourcePerArch:
, autoPatchelfHook , autoPatchelfHook
, alsaLib , alsaLib
, freetype , freetype
, fontconfig
, zlib , zlib
, xorg , xorg
}: }:
@ -26,8 +27,8 @@ let result = stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib freetype zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst
xorg.libXrender xorg.libXi xorg.libXrender
]; ];
nativeBuildInputs = [ autoPatchelfHook ]; nativeBuildInputs = [ autoPatchelfHook ];
@ -52,11 +53,16 @@ let result = stdenv.mkDerivation rec {
mkdir -p $out/nix-support mkdir -p $out/nix-support
# Set JAVA_HOME automatically. # Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook cat <<EOF >> "$out/nix-support/setup-hook"
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF EOF
''; '';
preFixup = ''
find "$out" -name libfontmanager.so -exec \
patchelf --add-needed libfontconfig.so {} \;
'';
# FIXME: use multiple outputs or return actual JRE package # FIXME: use multiple outputs or return actual JRE package
passthru.jre = result; passthru.jre = result;