SDL_compat: set rpath during installation; add tests#405305
Merged
pbsds merged 3 commits intoNixOS:masterfrom May 10, 2025
Merged
SDL_compat: set rpath during installation; add tests#405305pbsds merged 3 commits intoNixOS:masterfrom
pbsds merged 3 commits intoNixOS:masterfrom
Conversation
marcin-serwin
force-pushed
the
push-qqpvkyokukql
branch
from
b4557f8 to
ca2f549
Compare
github-actions
bot
added
10.rebuild-darwin: 11-100
Contributor
|
The rpath things currently cause build failures on darwin, see https://hydra.nixos.org/build/296088873 Tagging ZHF because this is an existing failure: #403336 |
LordGrimmauld
added
the
0.kind: ZHF Fixes
Contributor
Author
That was the motivation, see the description.
I'm running |
Contributor
Author
Darwin runners fail during check phase with the error below. I can disable Details |
Contributor
|
I know too little darwin things to judge whether this indicates actual breakage on darwin or just a failed check. But it does make sense to disable the checks on darwin. We previously didn't have any checks, so having linux checks is already a massive improvement. |
marcin-serwin
force-pushed
the
push-qqpvkyokukql
branch
from
ca2f549 to
50cd3a9
Compare
Contributor
LordGrimmauld
left a comment
LordGrimmauld
left a comment
There was a problem hiding this comment.
Almost looking good, have some nits.
Comment on lines
+82
to
+86
Contributor
There was a problem hiding this comment.
Suggested change
| checkPhase = '' | |
| runHook preCheck | |
| ./testver | |
| runHook postCheck | |
| ''; | |
| nativeInstallCheckInputs = [ | |
| versionCheckHook | |
| ]; | |
| doInstallCheck = true; |
The version check hook is probably the more-correct way of doing this check
Contributor
Author
There was a problem hiding this comment.
versionCheckHook runs the installed executable of the package with --version argument, the testver is just one of many example programs that are built alongside the lib and never installed. Most of them are displaying something on the screen or are benchmarking so they're not very useful for us.
Contributor
There was a problem hiding this comment.
Okay fair! Just feels a bit weird: sdl-config has a --version flag you can give it, so versionCheckHook do the same thing at a glance. Might need a comment explaining you want the example program explicitly, not simply a version check.
Contributor
Author
There was a problem hiding this comment.
I forgot that it installs sdl-config. Looking at the code, the --version argument just echoes the hardcoded version so testver, which actually links to the built library, is a better indication that it works. We can still add versionCheckHook as a separate test to check if sdl-config is installed.
marcin-serwin
force-pushed
the
push-qqpvkyokukql
branch
from
50cd3a9 to
69948e3
Compare
LordGrimmauld
approved these changes
May 8, 2025
Contributor
Author
|
Linuxes are still running but
|
Contributor
|
This PR shouldn't break outwards API as far as i can tell, so these other failures likely have other issues that are not directly related to this PR |
Contributor
Author
|
Looking at the logs, some are caused by runner terminating too early causing missing logs (e.g. Seems unrelated to this PR though. |
|
Contributor
This was referenced May 9, 2025
Member
|
double checked SDL_mixer on aarch64-darwin, lgtm 👍 |
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
5 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.
This should fix darwin builds, making #404948 no longer needed.
ZHF: #403336
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.