From d157322b75ebe7e4468fd1e86be313c38fb9982a Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Tue, 14 Oct 2025 13:19:54 -0300 Subject: [PATCH] vscode-extensions.rust-lang.rust-analyzer: fix keytar issue on darwin --- .../vscode/extensions/rust-lang.rust-analyzer/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 2f9d65366c08..3de3817de808 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -1,4 +1,5 @@ { + clang_20, pkgsBuildBuild, lib, fetchFromGitHub, @@ -9,7 +10,7 @@ moreutils, esbuild, pkg-config, - libsecret, + stdenv, setDefaultServerPath ? true, }: @@ -43,7 +44,9 @@ let esbuild # Required by `keytar`, which is a dependency of `vsce`. pkg-config - ]; + + ] + ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 installPhase = ''