public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tachyon: fix darwin build (#123558)

This commit is contained in:
Stéphan Kochen 2021-05-18 23:10:44 +02:00 committed by GitHub
parent 4b14908706
commit 3ac820e157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/libraries/tachyon/darwin.patch
View File

@ -1,31 +0,0 @@
diff --git a/unix/Make-arch b/unix/Make-arch
index 08afb85..822c4fc 100644
--- a/unix/Make-arch
+++ b/unix/Make-arch
@@ -924,7 +924,7 @@ macosx-thr:
$(MAKE) all \
"ARCH = macosx-thr" \
"CC = cc" \
- "CFLAGS = -Os -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \
+ "CFLAGS = -Os -ffast-math -DBsd -DTHR $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \
@@ -946,7 +946,7 @@ macosx-x86-thr:
$(MAKE) all \
"ARCH = macosx-x86-thr" \
"CC = cc" \
- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -F/System/Library/Frameworks $(MISCFLAGS)" \
+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \
@@ -957,7 +957,7 @@ macosx-x86-thr-ogl:
$(MAKE) all \
"ARCH = macosx-x86-thr-ogl" \
"CC = cc" \
- "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include -F/System/Library/Frameworks $(MISCFLAGS) -DUSEOPENGL" \
+ "CFLAGS = -O2 -ffast-math -DBsd -DTHR -I/usr/X11R6/include $(MISCFLAGS) -DUSEOPENGL" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \

8
pkgs/development/libraries/tachyon/default.nix
View File

@ -48,14 +48,18 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else
throw "Don't know what arch to select for tachyon build"; throw "Don't know what arch to select for tachyon build";
makeFlags = [ arch ]; makeFlags = [ arch ];
patches = [ patches = [
# Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild)
./no-absolute-paths.patch ./no-absolute-paths.patch
# Include new targets (like arm) # Include new targets (like arm)
./make-archs.patch ./make-archs.patch
] ++ ];
postPatch = ''
# Ensure looks for nix-provided Carbon, not system frameworks # Ensure looks for nix-provided Carbon, not system frameworks
lib.optional stdenv.isDarwin ./darwin.patch; substituteInPlace unix/Make-arch \
--replace '-F/System/Library/Frameworks' ""
'';
installPhase = '' installPhase = ''
cd ../compile/${arch} cd ../compile/${arch}