mariadb: fix darwin build #33517
Merged
mariadb: fix darwin build #33517
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
orivej
reviewed
Jan 6, 2018
| @@ -121,7 +122,8 @@ everything = stdenv.mkDerivation (common // { | |||
| buildInputs = common.buildInputs ++ [ | |||
| xz lzo lz4 bzip2 snappy | |||
| libxml2 boost judy libevent cracklib | |||
| ] ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]; | |||
| ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl | |||
| ++ optional stdenv.isDarwin libiconv; | |||
There was a problem hiding this comment.
libiconv probably belongs to common, not just everything.
There was a problem hiding this comment.
That also worked, just did the minimal stuff to get it working.
There was a problem hiding this comment.
It was not sufficient because mariadb.client was left broken. I have fixed it in 306eefa .
There was a problem hiding this comment.
Thanks, I didn't to check the client.
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
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)