Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

nix: Fix dev shell on Darwin (#58032)

Jakub Konkaa3669a29e6dc
diff --git a/nix/modules/devshells.nix b/nix/modules/devshells.nix
index d898d62541d..da6ba6fd113 100644
--- a/nix/modules/devshells.nix
+++ b/nix/modules/devshells.nix
@@ -37,30 +37,32 @@
name = "zed-editor-dev";
inputsFrom = [ zed-editor ];
- packages = with pkgs; [
- wrappedCargo # must be first, to shadow the `cargo` provided by `rustToolchain`
- rustToolchain # cargo, rustc, and rust-toolchain.toml components included
- cargo-nextest
- cargo-hakari
- cargo-machete
- cargo-zigbuild
- # TODO: package protobuf-language-server for editing zed.proto
- # TODO: add other tools used in our scripts
+ packages =
+ with pkgs;
+ [
+ wrappedCargo # must be first, to shadow the `cargo` provided by `rustToolchain`
+ rustToolchain # cargo, rustc, and rust-toolchain.toml components included
+ cargo-nextest
+ cargo-hakari
+ cargo-machete
+ cargo-zigbuild
+ # TODO: package protobuf-language-server for editing zed.proto
+ # TODO: add other tools used in our scripts
- # `build.nix` adds this to the `zed-editor` wrapper (see `postFixup`)
- # we'll just put it on `$PATH`:
- nodejs_22
- zig
+ # `build.nix` adds this to the `zed-editor` wrapper (see `postFixup`)
+ # we'll just put it on `$PATH`:
+ nodejs_22
+ zig
- # A11y testing infra
- gobject-introspection
- at-spi2-core
- (python3.withPackages (ps: [
- ps.pyatspi
- ps.pygobject3
- ]))
- accerciser
- ];
+ # A11y testing infra
+ gobject-introspection
+ at-spi2-core
+ (python3.withPackages (ps: [
+ ps.pyatspi
+ ps.pygobject3
+ ]))
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ accerciser ];
env =
(removeAttrs baseEnv [