Skip to content

openclonk: fix build#403871

Merged
Aleksanaa merged 7 commits intoNixOS:masterfrom
wolfgangwalther:openclonk
May 4, 2025
Merged

openclonk: fix build#403871
Aleksanaa merged 7 commits intoNixOS:masterfrom
wolfgangwalther:openclonk

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.

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
The ISC license always applies, the unfree part only is added
additionally.
@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 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 3, 2025
@wolfgangwalther wolfgangwalther added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label May 3, 2025
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
Member

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

Copy link
Member

@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 person. label May 3, 2025
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
28 of 29 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

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 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants