diff options
| author | Lily Ballard <lily@sb.org> | 2019-05-13 21:06:54 -0700 |
|---|---|---|
| committer | Lily Ballard <lily@sb.org> | 2019-05-14 18:38:56 -0700 |
| commit | 193018687cdf9bda15c526850b2e5fd558fd3204 (patch) | |
| tree | e0a87ec24fa98959127f5005177742b09dcb2557 /pkgs/applications/networking/sync | |
| parent | 1332725d5fdf66b8081a021368730886b827944c (diff) | |
unison: fix building on macOS with enableX11 = false
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.
Diffstat (limited to 'pkgs/applications/networking/sync')
| -rw-r--r-- | pkgs/applications/networking/sync/unison/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7862cc1e6e4f8..ad5a35eb251f7 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -20,8 +20,10 @@ 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 "") - + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); + makeFlags = [ + "INSTALLDIR=$(out)/bin/" + "UISTYLE=${if enableX11 then "gtk2" else "text"}" + ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; preInstall = "mkdir -p $out/bin"; |