SDL_compat: patch sdl-config to use setup-hook#387357
Merged
pbsds merged 2 commits intoNixOS:masterfrom Mar 10, 2025
Merged
Conversation
13 tasks
github-actions
bot
added
10.rebuild-darwin: 1-10
marcin-serwin
force-pushed
the
push-qynqknmwzyux
branch
from
a8e0650 to
f59fc00
Compare
13 tasks
Member
|
Diff LGTM, running a nixpkgs-review... |
|
Member
Could you remove one such patch in this PR to show it works? |
Contributor
Author
I've removed it from the |
LordGrimmauld
approved these changes
Mar 10, 2025
Contributor
LordGrimmauld
left a comment
LordGrimmauld
left a comment
There was a problem hiding this comment.
Nice work! The CI seems successful (tho i am running nixpkgs-review again just to be sure.
marcin-serwin
force-pushed
the
push-qynqknmwzyux
branch
2 times, most recently
from
d676afb to
69924c6
Compare
The setup hook creating SDL_PATH variable was copied from the SDL1, however, the necessary patch to `sdl-config.in` was not adapted making the hook useless.
marcin-serwin
force-pushed
the
push-qynqknmwzyux
branch
from
69924c6 to
16ed9c7
Compare
Contributor
|
LordGrimmauld
approved these changes
Mar 10, 2025
Member
|
Thanks! |
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The setup hook creating SDL_PATH variable was copied from the SDL1, however, the necessary patch to
sdl-config.inwas not adapted making the hook useless.This will allow to use the SDL_compat as SDL replacement without manual hacks like this:
nixpkgs/pkgs/games/rott/default.nix
Lines 47 to 51 in d223cfb
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.