haxe_4_1,haxe_4_2: fix build on Darwin #119973
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
| @@ -31,7 +31,7 @@ let | |||
| inherit version; | |||
|
|
|||
| buildInputs = [ zlib pcre neko ] | |||
| ++ lib.optional (lib.versionAtLeast version "4.1") [ mbedtls ] | |||
| ++ lib.optionals (lib.versionAtLeast version "4.1") ([ mbedtls ] ++ lib.optional stdenv.hostPlatform.isDarwin [ Security ]) | |||
There was a problem hiding this comment.
I think this is a bit more readable this way. Also: Are you sure this issue doesn't affect 4.0 or any previous version?
Suggested change
| ++ lib.optionals (lib.versionAtLeast version "4.1") ([ mbedtls ] ++ lib.optional stdenv.hostPlatform.isDarwin [ Security ]) | |
| ++ lib.optionals (lib.versionAtLeast version "4.1") [ mbedtls ] | |
| ++ lib.optionals (lib.versionAtLeast version "4.1" && stdenv.hostPlatform.isDarwin) [ Security ] |
Also using just stdenv.isDarwin is fine.
There was a problem hiding this comment.
Also: Are you sure this issue doesn't affect 4.0 or any previous version?
Tested all packaged versions. 3.x and 4.0 compile fine, only 4.1 and 4.2 error out.
OPNA2608
force-pushed
the
fix/haxe_darwin/21.05
branch
from
923b51f
to
e2bb60a
Compare
|
Thank you! |
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
Haxe 4.1 and 4.2 require
Securityon Darwin, noticed it earlier today while trying to use them on my machine for the first time.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)