Skip to content

fna3d: fix CMake 4.0 incompatibility by upgrading to 25.10#452952

Merged
Sigmanificient merged 4 commits intoNixOS:masterfrom
hcsch:fix-fna3d-cmake4
Oct 18, 2025
Merged

fna3d: fix CMake 4.0 incompatibility by upgrading to 25.10#452952
Sigmanificient merged 4 commits intoNixOS:masterfrom
hcsch:fix-fna3d-cmake4

Conversation

@hcsch
Copy link
Contributor

@hcsch hcsch commented Oct 17, 2025

Building some steam related FHSEnv I noticed that fna3d was broken due to the CMake 4.0 upgrade (see #445447). I've updated it to a version that includes a fix making it compatible again. The fix was introduced in 25.05. It switched to building against SDL3 by default in version 25.03. I've opted to still build it against SDL2 by default in nixpkgs, to avoid a breaking? change for now.

I have not yet had the chance to test its functionality, but the release notes indicate no further breaking changes to my understanding.
See https://github.com/FNA-XNA/FNA3D/releases.

In the process of this I've also attempted to clean up the package nix file a bit, fixing the license and mainProgram meta attributes, and removing the unnecessarily? specialised install phase (just using the cmakeInstallPhase).

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

hcsch added 4 commits October 17, 2025 16:31
Upgrade FNA3D to version 25.10.
25.05 fixes CMake 4.0 compatibility.
25.03 builds against SDL3 by default. As I'm uncertain of whether this
is a non-breaking change, I've opted to default to building against SDL2
still for nixpkgs (at least for now to get the CMake 4.0 incompatibility
fixed).
Other changes seem to be non-breaking.

Diff: FNA-XNA/FNA3D@25.02...25.10
Changelog: https://github.com/FNA-XNA/FNA3D/releases
This ensures we install all shared libraries without manual
intervention, as well as CMake and pkg-config files and headers.
fna3d does not provide any installable binaries, except for those built
when tracing support is enabled (and it does not by default install
those). Tracing support and associated binaries could be added as an
optional feature, but currently require patching the CMakeLists.txt, or
manual installation steps.
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 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. labels Oct 17, 2025
@nix-owners nix-owners bot requested a review from mrtnvgr October 17, 2025 14:58
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Oct 17, 2025
@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Oct 17, 2025
@Sigmanificient
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 452952
Commit: 42ee273a97dae19ee32f4039704870d9b823b4fe (subsequent changes)
Merge: e2ca566687b3460d83fb9fe39e896821f946af5d

Logs: https://github.com/Sigmanificient/nixpkgs-review-gha/actions/runs/18600594771


x86_64-linux

✅ 1 package built:
  • fna3d

aarch64-linux

✅ 1 package built:
  • fna3d

@mrtnvgr
Copy link
Contributor

mrtnvgr commented Oct 18, 2025

@NixOS/nixpkgs-merge-bot merge

@nixpkgs-merge-bot
Copy link
Contributor

@mrtnvgr merge not permitted (#305350):
R-Ryantm Maintainer merge: pr author is not r-ryantm
CommitterPR: pr author is not committer

@Sigmanificient Sigmanificient added this pull request to the merge queue Oct 18, 2025
Merged via the queue into NixOS:master with commit 1bb70ae Oct 18, 2025
33 of 35 checks passed
@hcsch hcsch deleted the fix-fna3d-cmake4 branch October 18, 2025 16:21
@hcsch

This comment was marked as resolved.

@hcsch
Copy link
Contributor Author

hcsch commented Oct 19, 2025

Ah, damn it. I got myself confused over GitHub's display of merge commits. Sorry, please disregard the previous message. Thanks again

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

Labels

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants