Skip to content
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

Merged
merged 5 commits into from
Nov 25, 2021
Merged

mindustry: unbreak #146557

merged 5 commits into from
Nov 25, 2021

Conversation

Mindavi
Copy link
Contributor

@Mindavi Mindavi commented Nov 18, 2021

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
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@legendofmiracles
Copy link
Contributor

Result of nixpkgs-review pr 146557 run on x86_64-linux 1

2 packages built:
  • mindustry
  • mindustry-wayland

Copy link
Member

@fgaz fgaz left a 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!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/414

@symphorien
Copy link
Member

nix-review fails with

error: anonymous function at /home/symphorien/.cache/nixpkgs-review/pr-146557/nixpkgs/pkgs/games/mindustry/default.nix:1:1 called with unexpected argument 'jdk'

       at /home/symphorien/.cache/nixpkgs-review/pr-146557/nixpkgs/lib/customisation.nix:69:16:

           68|     let
           69|       result = f origArgs;
             |                ^
           70|
(use '--show-trace' to show detailed location information)

@Mindavi
Copy link
Contributor Author

Mindavi commented Nov 23, 2021

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.

@Mindavi
Copy link
Contributor Author

Mindavi commented Nov 23, 2021

Builds are not done yet, but this should be ok now. Builds succeeded. I also forgot to do the change for mindustry-server, that's done now too.

Tested all binaries again, they appear to run fine.

Comment on lines +168 to +169
glewlib=${lib.getLib glew}/lib/libGLEW.so
sdllib=${lib.getLib SDL2}/lib/libSDL2.so
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
glewlib=${lib.getLib glew}/lib/libGLEW.so
sdllib=${lib.getLib SDL2}/lib/libSDL2.so

Comment on lines +171 to +172
--add-needed $glewlib \
--add-needed $sdllib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
--add-needed $glewlib \
--add-needed $sdllib
--add-needed ${lib.getLib glew}/lib/libGLEW.so \
--add-needed ${lib.getLib SDL2}/lib/libSDL2.so

@symphorien symphorien merged commit 9d4747a into NixOS:master Nov 25, 2021
@Mindavi Mindavi deleted the mindustry/unbreak branch November 25, 2021 20:04
@github-actions
Copy link
Contributor

Backport failed for release-21.11, because it was unable to cherry-pick the commit(s).

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

@fgaz
Copy link
Member

fgaz commented Dec 14, 2021

Unfortunately I don't have much time to backport manually. Pinging people who might be interested: @maxhbr @Mindavi @petabyteboy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants