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

glib: patch to fix w/musl, static ctor order assumptions (quark/gobject) #42570

Merged
merged 2 commits into from Jun 25, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 25, 2018

From [1] with prefix added, using local copy to avoid dep on fetchpatch.

[1] https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/glib/patches/quark_init_on_demand.patch

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: glib

Partial log (click to expand)

/nix/store/wadfr3k5j0rpfw2kjrwci3hfac528dx2-glib-2.56.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: glib

Partial log (click to expand)

/nix/store/kcsi934n6paxnhzqh1hjir4glm9qbrc0-glib-2.56.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: glib

Partial log (click to expand)

/nix/store/fp3prj7glhag7c2bginvfcwx8c85fd75-glib-2.56.0

@dtzWill dtzWill changed the title glib: patch to fix w/musl, quark static ctor order assumptions [WIP] glib: patch to fix w/musl, quark static ctor order assumptions Jun 25, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

Marking as WIP for a bit, this appears incomplete or otherwise insufficient to fix the problem I'm seeing.

@dtzWill dtzWill changed the title [WIP] glib: patch to fix w/musl, quark static ctor order assumptions glib: patch to fix w/musl, static ctor order assumptions (quark/gobject) Jun 25, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

There we go, now NixOS tests work again :).

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: glib

Partial log (click to expand)

/nix/store/kcsi934n6paxnhzqh1hjir4glm9qbrc0-glib-2.56.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: glib

Partial log (click to expand)

/nix/store/fp3prj7glhag7c2bginvfcwx8c85fd75-glib-2.56.0

@dtzWill dtzWill merged commit 656dc51 into NixOS:master Jun 25, 2018
@dtzWill dtzWill deleted the fix/glib-musl-quark_init branch June 25, 2018 16:55
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: glib

Partial log (click to expand)

/nix/store/wadfr3k5j0rpfw2kjrwci3hfac528dx2-glib-2.56.0

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.

None yet

2 participants