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
base: 65028ce1c916
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0000a86d7cd4
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. (#… 

    …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)
    @tomfitzhenry @veprbl
    tomfitzhenry authored and veprbl committed Mar 27, 2019
    Copy the full SHA
    0000a86 View commit details
    Browse the repository at this point in the history