Skip to content

Commit

Permalink
Fix build on aarch64-darwin (helix-editor#1789)
Browse files Browse the repository at this point in the history
Co-authored-by: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
  • Loading branch information
jdahm and yusdacra authored May 3, 2022
1 parent d2b1add commit e529ca1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
31 changes: 15 additions & 16 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
package = "helix";
};
overrides = {
cCompiler = common: if common.pkgs.stdenv.isLinux then common.pkgs.gcc else common.pkgs.clang;
crateOverrides = common: _: {
helix-term = prev:
let
Expand Down Expand Up @@ -57,7 +58,7 @@
env = prev.env ++ [
{ name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
{ name = "RUST_BACKTRACE"; value = "1"; }
{ name = "RUSTFLAGS"; value = "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"; }
{ name = "RUSTFLAGS"; value = if common.pkgs.stdenv.isLinux then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment" else ""; }
];
};
};
Expand Down

0 comments on commit e529ca1

Please sign in to comment.