Skip to content

Commit

Permalink
adoptopenjdk: Remove libfreetype.so from adoptopenjdk's derivation. (#…
Browse files Browse the repository at this point in the history
…58412)

This caused some reverse dependencies of adoptopenjdk to depend on
adoptopenjdk's libfreetype, rather than the NixOS
libfreetype. For example: #57733

Now the derivation does not contain libfreetype.so . The JRE links to
nixpkg's freetype:

$ ldd /nix/store/9iyxm1nkn35xhjgri041r980z4p5ls5g-adoptopenjdk-hotspot-bin-11.0.2/lib/libfontmanager.so | grep -i freetype
	libfreetype.so => /nix/store/ycbkq39cngzx19j829qzgdnw3mx3z78g-freetype-2.9.1/lib/libfreetype.so (0x0000795e30702000)

(cherry picked from commit 6bae073)
  • Loading branch information
tomfitzhenry authored and veprbl committed Mar 27, 2019
1 parent 65028ce commit 0000a86
Showing 1 changed file with 4 additions and 0 deletions.
Expand Up @@ -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
Expand Down

0 comments on commit 0000a86

Please sign in to comment.