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

[staging-next] glib: fix first build on darwin #306215

Merged
merged 1 commit into from
Apr 23, 2024
Merged

[staging-next] glib: fix first build on darwin #306215

merged 1 commit into from
Apr 23, 2024

Conversation

amaxine
Copy link
Contributor

@amaxine amaxine commented Apr 23, 2024

Description of changes

Pretty sure I resolved the conflict incorrectly around the time libelf changes landed. I have no means of building this on darwin.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@amaxine amaxine requested a review from vcunat April 23, 2024 08:27
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 23, 2024
@amaxine
Copy link
Contributor Author

amaxine commented Apr 23, 2024

@ofborg build glib

@amaxine amaxine changed the title glib: fix first build on darwin [staging-next] glib: fix first build on darwin Apr 23, 2024
@vcunat
Copy link
Member

vcunat commented Apr 23, 2024

I confirm that glib now builds on aarch64-darwin.

@mweinelt
Copy link
Member

/nix/store/7sdxwscppligyr6l3rm9dqyrdql7ga9g-glib-2.80.0-bin

@vcunat vcunat merged commit d42abe5 into NixOS:staging-next Apr 23, 2024
18 of 21 checks passed
@amaxine amaxine deleted the staging-fix-glib-darwin branch April 23, 2024 08:48
@vcunat vcunat mentioned this pull request Apr 23, 2024
27 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants