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

hdf4: simplify javaSupport #180081

Closed
wants to merge 1 commit into from
Closed

hdf4: simplify javaSupport #180081

wants to merge 1 commit into from

Conversation

jiegec
Copy link
Contributor

@jiegec jiegec commented Jul 4, 2022

Description of changes

For newer versions of JDK, the path to libawt.so does not exist. It can
be omitted and detected by CMake correctly.

This pr fixes the error on darwin:

$ nix-shell -I nixpkgs=$PWD -p "hdf4.override { javaSupport = true; }"
error: attribute 'architecture' missing

       at /Volumes/Data/nixpkgs/pkgs/tools/misc/hdf4/default.nix:16:32:

           15| let
           16|   javabase = "${jdk}/jre/lib/${jdk.architecture}";
             |                                ^
           17| in
(use '--show-trace' to show detailed location information)
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.

For newer versions of JDK, the path to libawt.so does not exist. It can
be omitted and detected by CMake correctly.
@jiegec
Copy link
Contributor Author

jiegec commented Jul 4, 2022

Result of nixpkgs-review pr 180081 run on x86_64-linux 1

1 package built:
  • hdfview

@jiegec jiegec mentioned this pull request Jul 5, 2022
13 tasks
@jiegec
Copy link
Contributor Author

jiegec commented Jul 8, 2022

The changes of this pr have been merged in commit 5c6b4f0

@jiegec jiegec closed this Jul 8, 2022
@jiegec jiegec deleted the hdf4-java branch July 8, 2022 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant