diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-08-10 14:47:54 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-08-19 18:54:48 -0400 |
| commit | b4480b798d995a7a7c27873c3bcb0a8098a805b0 (patch) | |
| tree | 45d063a871a4787d99e967cb9cb101b72218ba28 | |
| parent | d4e2cb08ff24a3df3a3deffbe578a51d187d419a (diff) | |
| download | nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.tar nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.tar.gz nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.tar.bz2 nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.tar.lz nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.tar.xz nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.tar.zst nixlib-b4480b798d995a7a7c27873c3bcb0a8098a805b0.zip | |
adoptopenjdk: fix fontconfig dependency
| -rw-r--r-- | pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 12 |
1 files 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 96abdffe3687..509050209fb2 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 <<EOF >> $out/nix-support/setup-hook + cat <<EOF >> "$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; |