-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
mindustry: unbreak #146557
mindustry: unbreak #146557
Conversation
Result of 2 packages built:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good and works for me!
8f61991
to
691d7c2
Compare
691d7c2
to
98783ac
Compare
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
nix-review fails with
|
I think I've fixed this locally. It was due to this: #119444, where the jdk was changed to jdk11 (which doesn't work at all for mindustry). Will test the builds and fix it. |
The PR NixOS#119444 broke the build for mindustry even further. This patch fixes that again so it evals and builds properly.
2f60e00
to
9e58e39
Compare
Tested all binaries again, they appear to run fine. |
glewlib=${lib.getLib glew}/lib/libGLEW.so | ||
sdllib=${lib.getLib SDL2}/lib/libSDL2.so |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
glewlib=${lib.getLib glew}/lib/libGLEW.so | |
sdllib=${lib.getLib SDL2}/lib/libSDL2.so |
--add-needed $glewlib \ | ||
--add-needed $sdllib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
--add-needed $glewlib \ | |
--add-needed $sdllib | |
--add-needed ${lib.getLib glew}/lib/libGLEW.so \ | |
--add-needed ${lib.getLib SDL2}/lib/libSDL2.so |
Backport failed for Please cherry-pick the changes locally. git fetch origin release-21.11
git worktree add -d .worktree/backport-146557-to-release-21.11 origin/release-21.11
cd .worktree/backport-146557-to-release-21.11
git checkout -b backport-146557-to-release-21.11
ancref=$(git merge-base e4562b5e0ac5f32415e3ecc8017b31b5d5cf46db 9e58e392a463a5e0c6585e179746b20f138054f7)
git cherry-pick -x $ancref..9e58e392a463a5e0c6585e179746b20f138054f7 |
Motivation for this change
This should fix:
jdk15 is not supported anymore by oracle / openjdk, but since it's just a game, I don't expect that's a big issue in practice.
I think propagating it like this is the right way to go about it, but please let me know if that seems wrong (and I'd like to hear the proper solution too then). I might have misunderstood how it works, but this seems like a good workaround to me.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)