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.

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

openjdk8: restore correct handling of cmm directory #72843

Merged
merged 1 commit into from Nov 24, 2019
Merged

openjdk8: restore correct handling of cmm directory #72843

merged 1 commit into from Nov 24, 2019

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

Fixes #72832

#65247 changed from using lndir to a plain symlink to link the JRE into the JDK, which got rid of the need to manually symlink the cmm directory. Not using lndir was found to be problematic and reverted in #68442, but the cmm fix was not added back. This PR fixes that.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @edwtjo @NeQuissimus @andrei-ilyin-mh

@lopsided98 lopsided98 mentioned this pull request Nov 5, 2019
Closed
@ofborg ofborg bot requested review from edwtjo and NeQuissimus November 5, 2019 17:20
@FRidh FRidh added this to Ready in Staging Nov 19, 2019
@FRidh FRidh merged commit 2dea864 into NixOS:master Nov 24, 2019
Staging automation moved this from Ready to Done Nov 24, 2019
@lopsided98 lopsided98 deleted the openjdk8-cmm-fix branch November 24, 2019 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeQuissimus NeQuissimus NeQuissimus approved these changes

@edwtjo edwtjo Awaiting requested review from edwtjo

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
Staging
  
Done
Milestone
No milestone
3 participants
@lopsided98 @NeQuissimus @FRidh