Skip to content
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.

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

aegisub: update OpenAL build for new Darwin SDK #355749

Closed
wants to merge 2 commits into from

Conversation

sarahec
Copy link
Contributor

@sarahec sarahec commented Nov 13, 2024

aegisub has the option to be built with or without OpenAL. On Darwin, this was done by explicitly importing the OpenAL framework from the SDK (and openal on other platforms).

The new Darwin setup imports the whole SDK, including OpenAL. So we need to explicitly exclude it when building without openal support.

Based on this review comment by @tjni

Darwin migration Tracker: #354146

IMPORTANT

Merge #355564 first.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@sarahec sarahec requested a review from tjni November 13, 2024 20:36
@sarahec sarahec force-pushed the aegisub-openal-darwin branch from 6860dea to 7ae5035 Compare November 13, 2024 21:09
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 14, 2024
@ofborg ofborg bot requested review from wegank and AndersonTorres November 14, 2024 09:25
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 14, 2024
@AndersonTorres
Copy link
Member

Please put the formatting in a separate commit.

@sarahec sarahec force-pushed the aegisub-openal-darwin branch from 7ae5035 to 75b704c Compare November 14, 2024 19:18
@sarahec
Copy link
Contributor Author

sarahec commented Nov 14, 2024

Please put the formatting in a separate commit.

I hand-reverted the spots where nixfmt rearranged things.

@sarahec
Copy link
Contributor Author

sarahec commented Nov 15, 2024

I had to move the patch into the upstream.

@sarahec sarahec closed this Nov 15, 2024
@sarahec sarahec deleted the aegisub-openal-darwin branch November 15, 2024 19:08
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 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants