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

olm: Allow building on Darwin #63958

Merged
merged 3 commits into from Jul 1, 2019
Merged

olm: Allow building on Darwin #63958

merged 3 commits into from Jul 1, 2019

Conversation

bdesham
Copy link
Contributor

@bdesham bdesham commented Jun 30, 2019

Motivation for this change

Small change to allow the “olm” package to build under Darwin (in addition to Linux).

Things done
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@risicle
Copy link
Contributor

risicle commented Jun 30, 2019

This builds for me on macos 10.13, but it "enables" the reverse dependency weechat-matrix-bridge - you should probably disable it for darwin until it gets fixed.

@risicle
Copy link
Contributor

risicle commented Jun 30, 2019

Same for mtxclient and nheko

@bdesham
Copy link
Contributor Author

bdesham commented Jul 1, 2019

@risicle Thank you for mentioning these! Is there a command that will discover such packages or did you just grep the repository for “olm”?

I’ve marked weechat-matrix-bridge and mtxclient broken under Darwin. With that done, nheko will also refuse to build (since it depends on mtxclient)—let me know if that’s sufficient or if I should explicitly mark nheko as broken too.

@ofborg ofborg bot requested a review from fpletz July 1, 2019 03:46
@risicle
Copy link
Contributor

risicle commented Jul 1, 2019

I use the nox tool's nox-review wip command to find packages affected by certain commit(s), but I think all the cool kids are using the newer nix-review tool.

@kalbasit
Copy link
Member

kalbasit commented Jul 1, 2019

@GrahamcOfBorg build olm

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.

code looks good, builds ok. Commits need to be re-worked to fit the contribution guide.

@bdesham
Copy link
Contributor Author

bdesham commented Jul 1, 2019

@kalbasit Yep, I was planning to rebase once code review was done 🙂 Thanks for taking a look!

@kalbasit
Copy link
Member

kalbasit commented Jul 1, 2019

@bdarnell I'm sorry for the confusion. Breaking down the commit into 3 different commits (one per derivation) was correct, just the wording was not. I was expecting to see something along these lines:

  • olm: allow building on Darwin
  • weechat-matrix-bridge: mark package as broken on Darwin
  • mtxclient: mark package as broken on Darwin

Thanks!

All of the dependencies of this package are now available on Darwin, but
the package itself still fails to build on that platform.
All of the dependencies of this package are now available on Darwin, but
the package itself still fails to build on that platform.
@bdesham
Copy link
Contributor Author

bdesham commented Jul 1, 2019

@kalbasit No worries. I’ve force pushed again; see how that looks.

@kalbasit kalbasit merged commit 863bc6e into NixOS:master Jul 1, 2019
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

4 participants