zlib: Fix iOS cross build for 18.09 #46904
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. CHOST is how one specifies the cross host platform with this non-standard configure script. We were just getting lucky with Linux cross. 2. install_name_tool needs the the binutils prefix.
grahamc
reviewed
Sep 19, 2018
| @@ -78,4 +78,8 @@ stdenv.mkDerivation rec { | |||
| license = licenses.zlib; | |||
| platforms = platforms.all; | |||
| }; | |||
| } | |||
| } // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { | |||
| preConfigure = '' | |||
There was a problem hiding this comment.
This is pretty weird, is it wrong to define preConfigure always with an optional value?
There was a problem hiding this comment.
That would be a mass rebuild.
There was a problem hiding this comment.
I'll do a staging PR after.
|
Success on x86_64-darwin (full log) Attempted: zlib Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: zlib Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: zlib Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Backport of #46905.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)