Merge pull request #57750 from tomfitzhenry/remove-freetype-from-adoptopenjdk

Remove libfreetype.so from adoptopenjdk's derivation.
2019-03-25 22:19:16 -04:00 · 2019-03-25 22:19:16 -04:00 · 5d173c9ee2
commit 5d173c9ee2
parent 810f2ba1f3 6bae07337e
1 changed files with 4 additions and 0 deletions
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@ -72,6 +72,10 @@ let result = stdenv.mkDerivation rec {
    # Remove some broken manpages.
    rm -rf $out/man/ja*

+    # Remove embedded freetype to avoid problems like
+    # https://github.com/NixOS/nixpkgs/issues/57733
+    rm $out/lib/libfreetype.so
+
    # for backward compatibility
    ln -s $out $out/jre