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

[staging-next] picocrypt: fix evaluation on Darwin #324580

Merged
merged 2 commits into from
Jul 4, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Jul 4, 2024

Description of changes

This was referencing libGL.dev, which no longer exists on Darwin. Since most of these dependencies are just for its vendored GLFW, and most of them weren’t even needed on Darwin anyway, copy the build inputs from our GLFW package instead.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

No need for this conditional any more.
This was referencing `libGL.dev`, which no longer exists on
Darwin. Since most of these dependencies are just for its vendored
GLFW, and most of them weren’t even needed on Darwin anyway, copy
the build inputs from our GLFW package instead.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 4, 2024
@K900 K900 merged commit 3f2ede5 into NixOS:staging-next Jul 4, 2024
9 of 10 checks passed
@ryand56
Copy link
Member

ryand56 commented Jul 4, 2024

Thanks, I was unaware that the libGL dev output no longer existed on Darwin.

@emilazy
Copy link
Member Author

emilazy commented Jul 5, 2024

It’s okay, it was a staging change. Taking the opportunity to plug my reference on the new state of libGL vs. libGLX vs. … :)

@emilazy emilazy deleted the push-lwlsznppxpzw branch August 26, 2024 01:05
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants