From 9f688ac24ba5a2308950aa7b64e84cc6ace3bcf3 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:14:35 -0700 Subject: [PATCH] vscode: fix darwin build It seems that the ripgrep path has changed in 1.94.0. --- pkgs/applications/editors/vscode/generic.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 5ed75a0ce32e1..3a993c93b1db9 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -233,8 +233,11 @@ in '' + ( let vscodeRipgrep = - if stdenv.isDarwin then - "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" + if stdenv.hostPlatform.isDarwin then + if lib.versionAtLeast version "1.94.0" then + "Contents/Resources/app/node_modules/@vscode/ripgrep/bin/rg" + else + "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" else "resources/app/node_modules/@vscode/ripgrep/bin/rg"; in