Skip to content

ogre-next: add darwin support#501202

Merged
marcin-serwin merged 2 commits into
NixOS:masterfrom
taylorhoward92:ogre-next-darwin-support
Apr 10, 2026
Merged

ogre-next: add darwin support#501202
marcin-serwin merged 2 commits into
NixOS:masterfrom
taylorhoward92:ogre-next-darwin-support

Conversation

@taylorhoward92
Copy link
Copy Markdown
Contributor

This PR adds darwin support to ogre-next and also fixes the issue that made this broken on aarch64. This change is being made so that ogre-next can be used as a unix dependency of gz-sim (to be added in a later PR) and is one of two PRs required to support adding gz-sim (the other is #500349).

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.

@nixpkgs-ci nixpkgs-ci Bot requested a review from marcin-serwin March 19, 2026 02:49
@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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 12.first-time contribution This PR is the author's first one; please be gentle! labels Mar 19, 2026
@ofborg ofborg Bot added the 6.topic: darwin Running or building packages on Darwin label Mar 19, 2026
@taylorhoward92
Copy link
Copy Markdown
Contributor Author

Turns out gz-sim actually requires Ogre 2.x not 3.x so I'll need to add that as a new package in a separate PR. Happy for these changes to still go in or for this PR to just be closed.

Comment thread pkgs/by-name/og/ogre-next/package.nix Outdated
Comment thread pkgs/by-name/og/ogre-next/package.nix
Comment thread pkgs/by-name/og/ogre-next/package.nix Outdated
Comment thread pkgs/by-name/og/ogre-next/package.nix Outdated
@taylorhoward92 taylorhoward92 force-pushed the ogre-next-darwin-support branch 3 times, most recently from b174255 to 7dc5dbe Compare April 7, 2026 09:59
Copy link
Copy Markdown
Contributor

@marcin-serwin marcin-serwin left a comment

Choose a reason for hiding this comment

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

Please squash fixup commits. Could you also split out adding pkgConfigModules from the darwin fixes into its own commit as they are independent changes?

Comment thread pkgs/by-name/og/ogre-next/package.nix Outdated
@taylorhoward92 taylorhoward92 force-pushed the ogre-next-darwin-support branch from 9229d0d to 37606b4 Compare April 9, 2026 23:02
taylorhoward92 and others added 2 commits April 10, 2026 09:12
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Add apple-sdk_15 for Metal/Cocoa/OpenGL frameworks on macOS
- Move openvr to Linux-only (broken on darwin)
- Disable framework bundle output on darwin (incompatible with Nix store)
- Guard Xcode-style POST_BUILD commands behind OGRE_BUILD_LIBS_AS_FRAMEWORKS
  to fix ninja "bad $-escape" error from $(PLATFORM_NAME)/$(CONFIGURATION)
- Remove Xcode-centric CMAKE_OSX_SYSROOT overrides (Nix stdenv handles this)
- Disable GL3Plus on darwin (missing Khronos headers; Metal is the primary
  render system on macOS)
- Disable both NEON and SSE2 SIMD on aarch64 (fixes build failures)
- Extend platforms from linux to unix

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@taylorhoward92 taylorhoward92 force-pushed the ogre-next-darwin-support branch from 37606b4 to 68101fd Compare April 9, 2026 23:14
@marcin-serwin
Copy link
Copy Markdown
Contributor

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 501202
Commit: 68101fd57b70aa8e06ca2e746be9a06366130f91 (subsequent changes)
Merge: 114f24f123a27497ce02c2225e0ff4ac2a45b60a

Logs: https://github.com/marcin-serwin/nixpkgs-review-gha/actions/runs/24248718061


x86_64-linux

✅ 2 packages built:
  • ogre-next
  • stuntrally

aarch64-linux

✅ 2 packages built:
  • ogre-next
  • stuntrally

x86_64-darwin (sandbox = relaxed)

✅ 1 package built:
  • ogre-next

aarch64-darwin (sandbox = relaxed)

✅ 1 package built:
  • ogre-next

@marcin-serwin marcin-serwin added this pull request to the merge queue Apr 10, 2026
Merged via the queue into NixOS:master with commit c44667e Apr 10, 2026
25 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants