83c1e8c319
The install script was escaping the Nix environment on Mac OS by using `xcrun -sdk macos clang` as its C compiler. Using the Nix compiler required declaring the necessary frameworks as inputs and patching build scripts to assume MacOS 10.12 (and not try to detect). So cached derivations prior to this would probably not work on all intended target machines. This *might* also fix installCheck on Darwin on Hydra. Other minor fixes: * Disable parallel building due to a race with a missing y.tab.h * Use NIX_CFLAGS_COMPILE/NIX_LDFLAGS instead of trying to synthesize something like them. * X11 dependencies aren't used on Darwin when the windowing system is correctly detected
24 lines
593 B
Diff
24 lines
593 B
Diff
From d1f0bd3de7d3d54523aeefd9731ea850d20eaab4 Mon Sep 17 00:00:00 2001
|
|
From: Jason Felice <jason.m.felice@gmail.com>
|
|
Date: Tue, 2 Jul 2019 13:19:23 -0400
|
|
Subject: [PATCH] Need CoreFoundation
|
|
|
|
---
|
|
src/cmd/devdraw/cocoa-screen.m | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m
|
|
index 97128da2..0e380dd3 100644
|
|
--- a/src/cmd/devdraw/cocoa-screen.m
|
|
+++ b/src/cmd/devdraw/cocoa-screen.m
|
|
@@ -56,6 +56,7 @@
|
|
#endif
|
|
|
|
AUTOFRAMEWORK(Cocoa)
|
|
+AUTOFRAMEWORK(CoreFoundation)
|
|
|
|
#define LOG if(0)NSLog
|
|
#define panic sysfatal
|
|
--
|
|
2.21.0
|
|
|