diff options
Diffstat (limited to 'pkgs/development/libraries/tachyon/default.nix')
| -rw-r--r-- | pkgs/development/libraries/tachyon/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
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} |