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

openssl: Fix openssl build for x86_64-unknown-linux-musl #82708

Merged
merged 1 commit into from Mar 22, 2020

Conversation

hamishmack
Copy link
Contributor

Motivation for this change

When cross compiling for openssl for musl nixpkgs configures openssl with linux-generic64 instead of linux-x86_64. Without the no-asm option this fails on x86_64 platforms (I think it skips both the asm and C versions of the functions). This PR changes it so that even if the hostPlatform.system is x86_64-unknown-linux-musl (rather than just x86_64-linux) openssl is configured with linux-x86_64.

To reproduce the issue run:

nix-build --system x86_64-linux -E '(import ./. {crossSystem = "x86_64-unknown-linux-musl";}).openssl'
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.

@michaelpj
Copy link
Contributor

It would be great if this could be backported to 20.03 as well!

hamishmack added a commit to input-output-hk/haskell.nix that referenced this pull request Mar 17, 2020
@matthewbauer matthewbauer merged commit 4327049 into NixOS:master Mar 22, 2020
hamishmack added a commit to hamishmack/nixpkgs that referenced this pull request Mar 23, 2020
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

3 participants