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

lua-{5.2,5.3}: cross fixups, drop crossAttrs #37599

Merged
merged 1 commit into from Mar 22, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 21, 2018

mostly just forward environment variables to make arguments,
this partially reverts 5d1e51a
which removed them because they're already set in env--
but that's not enough to override make vars.

Also, readline is buildInput not nativeBuildInput

(we need headers and to link against it)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

mostly just forward environment variables to make arguments,
this partially reverts 5d1e51a
which removed them because they're already set in env--
but that's not enough to override make vars.

Also, readline is buildInput not nativeBuildInput

(we need headers and to link against it)
@7c6f434c
Copy link
Member

Of course, I have never cross-compiled Lua…

@dtzWill
Copy link
Member Author

dtzWill commented Mar 21, 2018

Of course, I have never cross-compiled Lua…

So you're not biased like all that lua-cross crowd! 😁

@dtzWill
Copy link
Member Author

dtzWill commented Mar 22, 2018

@angerman I'd like to merge this, feeling guilt-free for dropping crossAttrs cruft since it didn't even eval until dtzWill@681555c . That said, since you're working on Darwin and mingw thought I'd check before possibly introducing breakage.

Thoughts/objections?

@angerman
Copy link
Contributor

I’ve not touched or used lua in Nix at all.

@dtzWill
Copy link
Member Author

dtzWill commented Mar 22, 2018

Great! I ran into it via cross-haskell when attempting to build pandoc (was first haskell package I thought of, but it's very ambitious in terms of dependencies haha).

Just wanted to make sure, thanks for quick response!

@dtzWill dtzWill merged commit c405768 into NixOS:staging Mar 22, 2018
@dtzWill dtzWill deleted the fix/lua-5.2-5.3-cross branch March 22, 2018 14:01
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