diff --git a/pkgs/development/libraries/tachyon/darwin.patch b/pkgs/development/libraries/tachyon/darwin.patch deleted file mode 100644 index dbede586f073..000000000000 --- a/pkgs/development/libraries/tachyon/darwin.patch +++ /dev/null @@ -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" \ diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 47cebd62df65..5994aeb0a590 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -48,14 +48,18 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; makeFlags = [ arch ]; + patches = [ # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) ./no-absolute-paths.patch # Include new targets (like arm) ./make-archs.patch - ] ++ - # Ensure looks for nix-provided Carbon, not system frameworks - lib.optional stdenv.isDarwin ./darwin.patch; + ]; + postPatch = '' + # Ensure looks for nix-provided Carbon, not system frameworks + substituteInPlace unix/Make-arch \ + --replace '-F/System/Library/Frameworks' "" + ''; installPhase = '' cd ../compile/${arch}