Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adoptopenjdk-bin: Remove libfreetype.so [backport to 18.09] #58411

Merged
merged 1 commit into from Mar 27, 2019
Merged

adoptopenjdk-bin: Remove libfreetype.so [backport to 18.09] #58411

merged 1 commit into from Mar 27, 2019

Conversation

tomfitzhenry
Copy link
Contributor

@tomfitzhenry tomfitzhenry commented Mar 26, 2019 •
edited

Motivation for this change

Fix kodi building on aarch64: https://hydra.nixos.org/build/91064101 diagnosed in #57733

Merged into master in #57750 .

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@tomfitzhenry
Remove libfreetype.so from adoptopenjdk's derivation.
9f95b21 
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 changed the title Remove libfreetype.so from adoptopenjdk's derivation. [Backport to 18.09] Remove libfreetype.so from adoptopenjdk's derivation. Mar 26, 2019
@tomfitzhenry tomfitzhenry changed the title [Backport to 18.09] Remove libfreetype.so from adoptopenjdk's derivation. adoptopenjdk-bin: Remove libfreetype.so [backport to 18.09] Mar 26, 2019
@veprbl
Copy link
Member

veprbl commented Mar 27, 2019

@GrahamcOfBorg build kodi

@veprbl veprbl merged commit c664b21 into NixOS:staging-18.09 Mar 27, 2019
@flokli flokli mentioned this pull request Mar 27, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tomfitzhenry @veprbl @GrahamcOfBorg