Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 51ba0286acc3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c664b213374f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 27, 2019

  1. adoptopenjdk: Remove libfreetype.so from adoptopenjdk's derivation. (#… 

    …58411)

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)
    @tomfitzhenry @veprbl
    tomfitzhenry authored and veprbl committed Mar 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c664b21 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
4 changes: 4 additions & 0 deletions pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View file
Original file line number Diff line number Diff line change
@@ -80,6 +80,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