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

wrk: use packaged openssl, luajit #24481

Merged
merged 1 commit into from Mar 30, 2017

Conversation

pmahoney
Copy link
Contributor

This has the side effect of now building on darwin. Previously, the
vendored luajit would fail to build.

Motivation for this change

Want to build on darwin. Also using the nixpkgs luajit and openssl rather than the vendored copies included in wrk (the vendored luajit failed to compile on darwin).

Note I included luajit in the function arguments, rather than lua combined with a lua = luajit in the callPackage because this package will only work with luajit and not other implementations. Happy to change that if that's the wrong style.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

This has the side effect of now building on darwin. Previously, the
vendored luajit would fail to build.
@mention-bot
Copy link

@pmahoney, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ragnard, @zimbatm and @pSub to be potential reviewers.

@zimbatm zimbatm merged commit ae696ba into NixOS:master Mar 30, 2017
@zimbatm
Copy link
Member

zimbatm commented Mar 30, 2017

Thanks, nice work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants