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

zed-editor: remove darwin workaround for isysroot #351973

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

niklaskorz
Copy link
Contributor

@niklaskorz niklaskorz commented Oct 28, 2024

Thanks to #349555, the NIX_CFLAGS_COMPILE for getting rust bindgen to find the system framework headers is not required anymore.
As discussed with @emilazy on matrix, this PR removes it.

Building without the workaround was already tested to review #349555, but to be sure, I'm running the build again based on the current staging branch.

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 28, 2024
@niklaskorz
Copy link
Contributor Author

✅ Build passed @emilazy

Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Awesome.

@emilazy emilazy merged commit 877a82f into NixOS:staging Oct 29, 2024
21 of 22 checks passed
@niklaskorz niklaskorz deleted the zed-editor-darwin-remove-cflags branch December 20, 2024 18:33
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants