8000 openclonk: fix build by wolfgangwalther · Pull Request #403871 · NixOS/nixpkgs · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

openclonk: fix build #403871

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 7 commits into from
May 4, 2025
Merged

openclonk: fix build #403871

merged 7 commits into from
May 4, 2025
+45 −41

Conversation

wolfgangwalther
Copy link
Contributor

ZHF: #403336

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@wolfgangwalther
openclonk: cleanup
1173897
@wolfgangwalther
openclonk: fix build
3a2b296 
cmake complained about not finding X11_LIBRARIES, which is fixed by
providing libXrandr.

Adding ninja fixes the installPhase which fails randomly. There is a
hack in upstream's CMakeLists.txt file that reads:

  USES_TERMINAL # Hack: prevent parallel execution (for ninja), c4group
tends to fail otherwise

This only works with ninja, though. Also enable parallel install phase
again, since this seems to work with ninja now.

This also fixes the build for aarch64-linux.
@wolfgangwalther wolfgangwalther requested a review from lluchs May 3, 2025 10:40
@wolfgangwalther
openclonk: unstable-2023-10-30 -> 9.0-unstable-2025-01-11
04e1cd7 
This fixes the game at run-time.
@wolfgangwalther
openclonk: remove cmakeFlags for gcc-unwrapped
9e83b2a 
Works without them, too.
@wolfgangwalther
openclonk: modernize
ed76a25
@wolfgangwalther
openclonk: fix license
0022de8 
The ISC license always applies, the unfree part only is added
additionally.
@wolfgangwalther
openclonk: adopt
18abb04
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels May 3, 2025
@wolfgangwalther wolfgangwalther added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label May 3, 2025
wolfgangwalther
wolfgangwalther commented May 3, 2025
View reviewed changes
pkgs/by-name/op/openclonk/package.nix
@@ -82,6 +83,7 @@ stdenv.mkDerivation {
libogg
libpng
libvorbis
libXrandr
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Instead of adding libXrandr here, #403479 could possibly fix it as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will still wait for #403479 and then see what that does for us.

@FKouhai
Copy link
Contributor
FKouhai commented May 3, 2025

nixpkgs-review result for #403871

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 403871

Logs: https://github.com/FKouhai/nixpkgs-review-gha/actions/runs/14811964213

x86_64-linux (sandbox = true)

✅ 1 package built:
  • openclonk

aarch64-linux (sandbox = true)

✅ 1 package built:
  • openclonk

FKouhai
FKouhai approved these changes May 3, 2025
View reviewed changes
Copy link
Contributor
@FKouhai FKouhai left a comment

Choose a reason for hiding this comment

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

thank you :)

@FKouhai FKouhai added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 3, 2025
lluchs
lluchs approved these changes May 3, 2025
View reviewed changes
Copy link
Contributor
@lluchs lluchs 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 on my machine.

@Aleksanaa Aleksanaa merged commit b50ab19 into NixOS:master May 4, 2025
30 of 31 checks passed
@wolfgangwalther wolfgangwalther deleted the openclonk branch May 4, 2025 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lluchs lluchs lluchs approved these changes

@FKouhai FKouhai FKouhai approved these changes

Assignees
No one assigned
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wolfgangwalther @FKouhai @lluchs @Aleksanaa
0