Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
nix: Go around a linker issue on Darwin (#58070)
Jakub Konka81f818aa86a9
diff --git a/nix/build.nix b/nix/build.nixindex 2f283f83a4d..0375b0de5f8 100644--- a/nix/build.nix+++ b/nix/build.nix@@ -38,6 +38,7 @@libxfixes,libxkbcommon,libxrandr,+ lld,libx11,libxcb,nodejs_22,@@ -137,6 +138,8 @@ let]++ lib.optionals stdenv'.hostPlatform.isLinux [ makeWrapper ]++ lib.optionals stdenv'.hostPlatform.isDarwin [+ # Provides `ld64.lld` for clang's `-fuse-ld=lld`.+ lld(cargo-bundle.overrideAttrs (new: old: {version = "0.6.1-zed";@@ -246,6 +249,11 @@ let}";NIX_OUTPATH_USED_AS_RANDOM_SEED = "norebuilds";+ }+ // lib.optionalAttrs stdenv'.hostPlatform.isDarwin {+ # Link with lld on Darwin. nixpkgs' classic open-source ld64 fails to insert+ # ARM64 branch thunks for this binary, producing `b(l) ARM64 branch out of range`.+ NIX_CFLAGS_LINK = "-fuse-ld=lld";};# prevent nix from removing the "unused" wayland/gpu-lib rpaths