From b4480b798d995a7a7c27873c3bcb0a8098a805b0 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 10 Aug 2019 14:47:54 -0400 Subject: [PATCH] adoptopenjdk: fix fontconfig dependency --- .../compilers/adoptopenjdk-bin/jdk-linux-base.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 96abdffe368..509050209fb 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -6,6 +6,7 @@ sourcePerArch: , autoPatchelfHook , alsaLib , freetype +, fontconfig , zlib , xorg }: @@ -26,8 +27,8 @@ let result = stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib freetype zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi - xorg.libXrender + alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst + xorg.libXi xorg.libXrender ]; nativeBuildInputs = [ autoPatchelfHook ]; @@ -52,11 +53,16 @@ let result = stdenv.mkDerivation rec { mkdir -p $out/nix-support # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook + cat <> "$out/nix-support/setup-hook" if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF ''; + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; + ''; + # FIXME: use multiple outputs or return actual JRE package passthru.jre = result;