quakespasm: fix build on Darwin#346972
Merged
emilazy merged 1 commit intoNixOS:masterfrom Oct 7, 2024
Merged
Conversation
52 tasks
emilazy
reviewed
Oct 7, 2024
pkgs/games/quakespasm/default.nix
Outdated
Member
There was a problem hiding this comment.
We could simply remove this to avoid the dependency on the deployment target variable, right? And in that case it could be unconditional, as it only affects Darwin compilation anyway and keeping patches unconditional is good hygiene.
Contributor
Author
There was a problem hiding this comment.
Probably the way to go is to use sed to delete the lines that try to set the version. It uses different ones depending on the platform.
Member
There was a problem hiding this comment.
Sounds reasonable. There’s already a patch to the Darwin Makefile so it could just be rolled into that.
reckenrode
force-pushed
the
push-rmkwsrqpxnwm
branch
from
936e52a to
ad5cbe9
Compare
ofborg
bot
added
10.rebuild-darwin: 1-10
QuakeSpasm tries to use a 10.6 deployment target on Darwin, which is too old for SDL2. Use the default to fix the build.
reckenrode
force-pushed
the
push-rmkwsrqpxnwm
branch
from
ad5cbe9 to
34a9538
Compare
emilazy
approved these changes
Oct 7, 2024
Member
emilazy
left a comment
emilazy
left a comment
There was a problem hiding this comment.
Confirmed build on x86_64-darwin and x86_64-linux.
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
2 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.
QuakeSpasm tries to use a 10.6 deployment target on Darwin, which is too old for SDL2. Use the default to fix the build.
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.