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

libwebsockets: Change default CMake flags for package #92291

Merged
merged 1 commit into from Jul 8, 2020

Conversation

leotaku
Copy link
Contributor

@leotaku leotaku commented Jul 4, 2020

This PR adds some configuration options to the libwebsockets package.

  • withPlugins :: Plugin support, this was already present but used to be non-configurable
  • withIPv6 :: IPv6 support
  • withSocks5 :: Socks5 support

Libwebsockets has numerous other configuration options which can be found here.
I'm not quite sure if it makes sense to support all of them in nixpkgs, but I would of course be willing to add them.

Motivation for this change

This is a prerequisite to #91549, as cloud support for netdata requires a libwebsockets build with non-default options.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented Jul 4, 2020

Why not just always enable them? Unless they experimental or blow up the package size too much, I would just always include them.

@leotaku
Copy link
Contributor Author

leotaku commented Jul 5, 2020

Sure, if that is the preferred way of handling such things. I am not attached to having these configuration options and would in fact prefer just adding the non-standard flags to the package, if that would be accepted.

@leotaku
Copy link
Contributor Author

leotaku commented Jul 6, 2020

@jtojnar I've now removed the package options and just added the required CMake flags unconditionally.

@leotaku leotaku changed the title libwebsockets: Add package configuration options libwebsockets: Change default CMake flags for package Jul 6, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Jul 6, 2020

Looks like there are some conflicts. Could you please rebase and squash?

The libwebsockets package is now built with support for IPv6 and
SOCKS5 in addition to general plugin support.
@jtojnar jtojnar merged commit 137d95c into NixOS:master Jul 8, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Jul 8, 2020

Thanks.

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