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.

Sign up for GitHub

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

Jump to bottom

glib: fix build on aarch64-darwin #322988

Merged
merged 1 commit into from
Jun 28, 2024
Merged

glib: fix build on aarch64-darwin #322988

merged 1 commit into from
Jun 28, 2024

Conversation

JohnRTitor
Copy link
Contributor

@JohnRTitor JohnRTitor commented Jun 27, 2024 •
edited
Loading

Description of changes

Fixes build on aarch64-darwin as a followup to #321913.

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 Jun 27, 2024
@JohnRTitor JohnRTitor requested review from jtojnar and vcunat June 27, 2024 19:25
@JohnRTitor
Copy link
Contributor Author

@ofborg build glib

My aarch64-darwin builder is currently building bison 😅

@vcunat
Copy link
Member

vcunat commented Jun 27, 2024

We need this for staging-next, but you included many commits from staging-next..staging.

@vcunat
Copy link
Member

vcunat commented Jun 27, 2024

And your rebuilding everything is exactly because of that.

@JohnRTitor JohnRTitor marked this pull request as draft June 27, 2024 19:35
@kalbasit
Copy link
Member

I just started building glib on my mac, it'll probably take a while. Do you indent to change the base? Should I cancel and wait for you to rebase?

@JohnRTitor JohnRTitor changed the base branch from staging to staging-next June 27, 2024 19:37
@JohnRTitor JohnRTitor marked this pull request as ready for review June 27, 2024 19:37
@JohnRTitor
Copy link
Contributor Author

Should be fine now.

kalbasit
kalbasit approved these changes Jun 27, 2024
View reviewed changes
Copy link
Member

@kalbasit kalbasit left a comment

Choose a reason for hiding this comment

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

The build went great on my mac.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 27, 2024
@wegank wegank added the 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people label Jun 27, 2024
jtojnar
jtojnar approved these changes Jun 27, 2024
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Thanks, probably no need to wait for ofborg since this was already confirmed by a hu-man

@vcunat
Copy link
Member

vcunat commented Jun 27, 2024

It failed there

292/341 glib:gio / gsocketclient-slow                                          ERROR             1.73s   killed by signal 6 SIGABRT

but probably just an overloaded builder?

@vcunat
Copy link
Member

vcunat commented Jun 27, 2024

Ah no, a sandboxing issue, more likely.

GLib-GIO:ERROR:../gio/tests/gsocketclient-slow.c:231:test_connection_failed: assertion failed (local_error == (g-io-error-quark, 39)): Could not connect to localhost: Can't assign requested address (g-io-error-quark, 0)

My check was on a machine with defaults (without sandboxing).

@JohnRTitor
Copy link
Contributor Author

Built for me.

johnrtitor@darwin01 ~ % nix build "github:nixos/nixpkgs/refs/pull/322988/merge#glib" --print-out-paths
/nix/store/4dgdwdnc1fl1fi8r4bjylwgm5lcdzahs-glib-2.80.3-bin

@JohnRTitor JohnRTitor merged commit 64123c7 into NixOS:staging-next Jun 28, 2024
36 checks passed
@JohnRTitor JohnRTitor deleted the fix-glib-darwin branch June 28, 2024 11:59
@vcunat vcunat mentioned this pull request Jun 29, 2024
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@jtojnar jtojnar jtojnar approved these changes

@trofi trofi trofi approved these changes

@kalbasit kalbasit kalbasit approved these changes

@hedning hedning Awaiting requested review from hedning

@dasj19 dasj19 Awaiting requested review from dasj19

@lovek323 lovek323 Awaiting requested review from lovek323

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@JohnRTitor @vcunat @kalbasit @trofi @jtojnar @wegank