Skip to content

flightgear: use forked openscenegraph #432102

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 1 commit into from
Aug 20, 2025
Merged

flightgear: use forked openscenegraph #432102

merged 1 commit into from
Aug 20, 2025

Conversation

guillaumematheron
Copy link
Contributor

As discussed on https://gitlab.com/flightgear/flightgear/-/issues/3106 , version 2024.1.1 of flightgear should be compiled against a version of openscenegraph that was forked from the main project, and is hosted in the same gitlab namespace.

This fork includes several fixes such as
https://gitlab.com/flightgear/openscenegraph/-/commit/724ff2ef687d84b266402724239f61a392d36f4c .

This change probably needs to be backported to nixos 25.05, but I have no idea what the process for that looks like.

cc maintainers @7c6f434c (raskin) and @aanderse

I suppose now simgear is orphaned, let me know if I should

  1. leave it as is (inline openscenegraph into flightgear, but use an override for simgear)
  2. or create a new package called openscenegraph-flightgear, and reference it in both simgear and flightgear
  3. or inline both openscenegraph and simgear into the flightgear derivation, and remove package simgear.

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.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 6.topic: games Gaming on NixOS 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Aug 8, 2025
@7c6f434c
Copy link
Member

I'd say openscenegraph definition is large enough to have its own .nix file, but having all three files in the same directory with only flightgear visible from outside sounds good to me.

@guillaumematheron
Copy link
Contributor Author

Sure, I extracted the openscenegraph fork into its own nix file, not exposed.
For simgear, I suggest leaving it as is (in pkgs/by-name/si/simgear) to avoid removing a working package from the namespace.

@7c6f434c
Copy link
Member

GitHub currently shows me a force-push where openscenegraph is still fully within the flightgear .nix file. Is this the intended outcome?

@guillaumematheron guillaumematheron force-pushed the flightgear branch 2 times, most recently from c273004 to 2edea2f Compare August 19, 2025 14:57
@guillaumematheron
Copy link
Contributor Author

GitHub currently shows me a force-push where openscenegraph is still fully within the flightgear .nix file. Is this the intended outcome?

Sorry I messed up my commit, should be fixed now.

7c6f434c
7c6f434c reviewed Aug 19, 2025
View reviewed changes
@7c6f434c
Copy link
Member

Ouch, now the linter demands that the file is passed through nixfmt, right…

@guillaumematheron
Copy link
Contributor Author

Sounds reasonable, done!

@guillaumematheron
flightgear: use forked openscenegraph
d03caf0 
As discussed on https://gitlab.com/flightgear/flightgear/-/issues/3106 ,
version 2024.1.1 of lfightgear should be compiled against a version of
openscenegraph that was forked from the main project.

This fork includes several fixes such as
https://gitlab.com/flightgear/openscenegraph/-/commit/724ff2ef687d84b266402724239f61a392d36f4c .
@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Aug 20, 2025
@7c6f434c 7c6f434c merged commit 3839f96 into NixOS:master Aug 20, 2025
25 of 28 checks passed
@7c6f434c
Copy link
Member

Sorry for multi-roundrip nitpicking

@guillaumematheron guillaumematheron mentioned this pull request Aug 21, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c 7c6f434c left review comments

Assignees
No one assigned
Labels
6.topic: games Gaming on NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@guillaumematheron @7c6f434c