unison: fix building on macOS with enableX11 = false #61483
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
ofborg
bot
added
6.topic: darwin
infinisil
reviewed
May 14, 2019
| @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { | |||
| echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile | |||
| ''; | |||
|
|
|||
| makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") | |||
| makeFlags = "INSTALLDIR=$(out)/bin/ UISTYLE=" + (if enableX11 then "gtk2" else "text") | |||
| + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); | |||
There was a problem hiding this comment.
Since you're already touching this code, I suggest this cleanup (untested):
{
makeFlags = [
"INSTALLDIR=$(out)/bin/"
"UISTYLE=${if enableX11 then "gtk2" else "text"}"
] ++ lib.optional ocaml.nativeCompilers "NATIVE=false";
}There was a problem hiding this comment.
That looks good to me. I'll test it out this evening.
Edit: Well, it should be lib.optional (!ocaml.nativeCompilers) "NATIVE=false" but otherwise it looks good.
There was a problem hiding this comment.
Done. I tested (on macOS) and the resulting derivation is identical to the previous version (both with and without enableX11).
If `UISTYLE` is not specified, Unison tries to auto-detect the UI style based on the available environment. On macOS this apparently means using `UISTYLE=mac`, it can't actually build this way in Nix.
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
If
UISTYLEis not specified, Unison tries to auto-detect the UI style based on the available environment. On macOS this apparently means usingUISTYLE=mac, it can't actually build this way in Nix. On other platforms this change shouldn't affect anything as it should be detectingtextif lablgtk2 isn't available.Without this change,
unisonfails to build on macOS whenconfig.unison.enableX11 = false.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)CC @viric