Skip to content

uhexen2: fix the build against SDL_compat#403284

Merged
K900 merged 1 commit intoNixOS:masterfrom
trofi:uhexen2-SDL_compat-fix
May 1, 2025
Merged

uhexen2: fix the build against SDL_compat#403284
K900 merged 1 commit intoNixOS:masterfrom
trofi:uhexen2-SDL_compat-fix

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 1, 2025

Without the change build fails due to missing libraries as https://hydra.nixos.org/build/294936344:

../h2shared/glheader.h:40:10: fatal error: GL/gl.h: No such file or directory
   40 | #include <GL/gl.h>
      |          ^~~~~~~~~

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.

Without the change build fails due to missing libraries as
https://hydra.nixos.org/build/294936344:

    ../h2shared/glheader.h:40:10: fatal error: GL/gl.h: No such file or directory
       40 | #include <GL/gl.h>
          |          ^~~~~~~~~
@trofi trofi mentioned this pull request May 1, 2025
13 tasks
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 1, 2025
@nix-owners nix-owners bot requested a review from xdHampus May 1, 2025 11:20
@trofi
Copy link
Contributor Author

trofi commented May 1, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 403284


x86_64-linux

✅ 1 package built:
  • uhexen2

@K900 K900 merged commit 746c088 into NixOS:master May 1, 2025
41 of 43 checks passed
@trofi trofi deleted the uhexen2-SDL_compat-fix branch May 1, 2025 11:31
@LordGrimmauld
Copy link
Contributor

Thanks! I am surprised this lost alsa, alsa should never have been propagated by SDL i think? But if its fixed now, i suppose it doesn't matter.

@trofi
Copy link
Contributor Author

trofi commented May 1, 2025

Looking at 491d1a5 (SDL1 removal commit) I see alsa-lib was propagated in SDL1:

  extraPropagatedBuildInputs = [ ]
     # ...
     ++ lib.optional alsaSupport alsa-lib

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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants