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

glfw3: general improvements #358007

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

Scrumplex
Copy link
Member

Closes #357732

Each commit has a description describing its primary change.

The formatting commit is last, to make reviewing easier. The evaluation should not change between HEAD and HEAD^

One fairly simple package to test these changes with is raylib-games. I was able to build and run asteroids both on XWayland and Wayland.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

CMAKE_C_FLAGS did not work previously, as it was defined multiple times.
Instead of fixing it, it is much more readable to use NIX_CFLAGS_COMPILE
instead of having to escape special characters across Nix, Bash and
CMake

Signed-off-by: Sefa Eyeoglu <[email protected]>
Including quotes around the library names should make these
substitutions stricter.

Signed-off-by: Sefa Eyeoglu <[email protected]>
libX11-xcb.so.1 and libXxf86vm.so.1 are dlopen-ed at runtime, but are
not linked by the linker. Let's hardcode their library paths into the
code.

Signed-off-by: Sefa Eyeoglu <[email protected]>
The new apple-sdk pattern doesn't require this anymore.

Signed-off-by: Sefa Eyeoglu <[email protected]>
Signed-off-by: Sefa Eyeoglu <[email protected]>
Signed-off-by: Sefa Eyeoglu <[email protected]>
@Scrumplex Scrumplex force-pushed the pkgs/glfw/general-improvements branch from cb0a034 to 00b5f4e Compare November 21, 2024 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

glfw: EGL library not found
1 participant