Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions nix/build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
libxfixes,
libxkbcommon,
libxrandr,
lld,
libx11,
libxcb,
nodejs_22,
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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
Expand Down
Loading