teeworlds: fix build on Darwin #270905
Merged
teeworlds: fix build on Darwin #270905
Conversation
This file contains 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
The Cocoa dependency is also needed when not building the Client. The Carbon dependency does not seem to be needed at all. The libGLU dependency does not currently build on macOS because of one of its transitive dependencies but teeworlds compiles and runs fine without libGLU on macOS, so just make this dependency Linux-only.
ofborg
bot
added
11.by: package-maintainer
jtbx
reviewed
Nov 29, 2023
| @@ -45,17 +52,16 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| buildInputs = [ | |||
| python3 lua5_3 zlib | |||
| wavpack | |||
| ] ++ lib.optionals stdenv.isDarwin [ | |||
| Cocoa | |||
There was a problem hiding this comment.
If this dependency isn't needed for the server it should be put in the lib.optionals buildClient list.
edit: did not read the commit message, looks good
jtbx
approved these changes
Nov 29, 2023
delroth
added
the
12.approvals: 1
|
Result of 2 packages built:
|
1 task
|
Successfully created backport PR for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes
Fix build on Darwin.
Also fix unbundling of the wavpack dependency when building teeworlds-server.
ZHF #265948
cc @jtbx
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/)Priorities
Add a 👍 reaction to pull requests you find important.