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

ft2-clone: Apply patch to fix Darwin building #250732

Merged
merged 1 commit into from
Sep 7, 2023

Conversation

OPNA2608
Copy link
Contributor

Description of changes

Applies 8bitbubsy/ft2-clone#30 instead of our custom patching, in hopes that OfBorg's aarch64-darwin run will convince upstream to merge the patch afterwards. 🙂

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@fgaz
Copy link
Member

fgaz commented Aug 22, 2023

Looks like it's working!

Rather than merging this, if upstream is going to merge 8bitbubsy/ft2-clone#30 I'd wait for a release since they happen often

Copy link
Member

@fgaz fgaz left a comment

Choose a reason for hiding this comment

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

But if you prefer to merge we can do that too, so here's an approval

@OPNA2608
Copy link
Contributor Author

Rather than merging this, if upstream is going to merge 8bitbubsy/ft2-clone#30 I'd wait for a release since they happen often

I'm fine with that option.

@figsoda figsoda added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Aug 25, 2023
@wegank wegank merged commit 3c6dc50 into NixOS:master Sep 7, 2023
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: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants