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

glew: enable both EGL and GLX #333707

Merged
merged 1 commit into from
Aug 11, 2024
Merged

glew: enable both EGL and GLX #333707

merged 1 commit into from
Aug 11, 2024

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Aug 10, 2024

Re-roll of #328907, but this time adding the patch from ArchLinux, which keeps both EGL and GLX code paths active.

Remove overrides where EGL was explicitly requested previously, as well as the glew-egl package variant.

I ran some games, which seemed to use the GLX path successfully, but this could get some more testing. @K900 can you check if the regressions mentioned in #328907 (comment) are working now?

Description of changes

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.

@K900
Copy link
Contributor

K900 commented Aug 11, 2024

Can go to master

@flokli
Copy link
Contributor Author

flokli commented Aug 11, 2024

Can go to master

@K900 did you test the things you mentioned were broken? I didn't white understand what, and how to test it by myself.

@K900
Copy link
Contributor

K900 commented Aug 11, 2024

I'm building it now.

@K900
Copy link
Contributor

K900 commented Aug 11, 2024

mangoapp works fine with this applied on top of latest unstable-small.

@flokli flokli marked this pull request as draft August 11, 2024 10:25
@flokli flokli changed the base branch from staging to master August 11, 2024 10:26
@flokli flokli marked this pull request as ready for review August 11, 2024 10:27
@flokli
Copy link
Contributor Author

flokli commented Aug 11, 2024

Rebased and targeted master, PTAL.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's sad we don't know how to reproduce the failure in a unit test, but I guess it's OK

Re-roll of NixOS#328907, but this time
adding the patch from ArchLinux, which keeps both EGL and GLX code paths
active.

Remove overrides where EGL was explicitly requested previously, as well
as the glew-egl package variant.

Add an alias for glew-egl, in case there's any users of this outside
of nixpkgs.
@SomeoneSerge SomeoneSerge merged commit 78d1fae into NixOS:master Aug 11, 2024
20 of 22 checks passed
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.

3 participants