Merge pull request #61483 from lilyball/unison

unison: fix building on macOS with enableX11 = false
This commit is contained in:
Silvan Mosberger 2019-05-16 18:47:26 +02:00 committed by GitHub
commit 23f8de06fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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";