Skip to content

openjdk*: fix darwin eval failure#194255

Merged
roberth merged 1 commit intoNixOS:staging-nextfrom
Artturin:fixevalfailjdk
Oct 4, 2022
Merged

openjdk*: fix darwin eval failure#194255
roberth merged 1 commit intoNixOS:staging-nextfrom
Artturin:fixevalfailjdk

Conversation

@Artturin
Copy link
Copy Markdown
Member

@Artturin Artturin commented Oct 3, 2022

only ./pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix has the gtkSupport option

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

only ./pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
has the gtkSupport option
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 3, 2022
@Artturin Artturin mentioned this pull request Oct 3, 2022
13 tasks
@Artturin Artturin requested a review from roberth October 3, 2022 17:04
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 3, 2022
@roberth
Copy link
Copy Markdown
Member

roberth commented Oct 4, 2022

@ofborg build openjdk

Copy link
Copy Markdown
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested manually on aarch64-darwin.

@roberth roberth merged commit 48177fb into NixOS:staging-next Oct 4, 2022
@roberth
Copy link
Copy Markdown
Member

roberth commented Oct 4, 2022

Thanks, and sorry for the inconvenience.

@Artturin Artturin deleted the fixevalfailjdk branch October 4, 2022 16:17
@Artturin Artturin mentioned this pull request Oct 4, 2022
13 tasks
then
# only linux has the gtkSupport option
if stdenv.isLinux
then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally adoptopenjdk.jdk-hotspot should take the flag on all platforms and complain if gtkSupport is true whne on darwin.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or could it take headless ? false?
While adoptopenjdk does not implement a headless optimization on darwin, a missing disk space optimization is harmless to ignore, so that would remove the need for a warning (unlike enabling a non-existing component, which I agree would need a warning).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants