This resolves crypto++ build problems on OSX #7756
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
| @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { | |||
| sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; | |||
| }; | |||
|
|
|||
| patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; | |||
| patches = [ (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch) | |||
There was a problem hiding this comment.
This is going to cause a mass-rebuild on linux because patches will evaluate to [ ./dll.patch [] ] instead of [ ./dll.patch ]. Can you try
(stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch) ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch)
instead?
There was a problem hiding this comment.
@gridaphobe done, and thanks.
gridaphobe
added a commit
that referenced
this pull request
May 11, 2015
This resolves crypto++ build problems on OSX
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.
This should also resolve #6150 and #6157 in a way that doesn't break other platforms. It essentially changes the makefile from using libtool to ar directly. As a note: I have only tested this in OSX 10.9.5 with some of the ocaml packages that depend on crypto++.