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: 810f2ba1f316
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5d173c9ee22c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2019

  1. Remove libfreetype.so from adoptopenjdk's derivation. 

    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)
    @tomfitzhenry
    tomfitzhenry authored and Tom committed Mar 16, 2019
    Copy the full SHA
    6bae073 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #57750 from tomfitzhenry/remove-freetype-from-adop… 

    …topenjdk

Remove libfreetype.so from adoptopenjdk's derivation.
    @matthewbauer
    matthewbauer authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5d173c9 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
@@ -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