From 8769a90f90ed8ad74dfbc3f7702f50279a76cc72 Mon Sep 17 00:00:00 2001 From: Morgan Wolfe Date: Mon, 29 May 2023 13:24:02 -0700 Subject: [PATCH] vscode: disable ripgrep patching on macOS useVSCodeRipgrep = false interferes with macOS 13's notarization enforcement and doesn't allow the app to start. Setting it to stdenv.isDarwin by default fixes the package for general use while preserving the option to patch ripgrep on older versions of macOS if required by someone's particular use case. --- pkgs/applications/editors/vscode/vscode.nix | 2 +- pkgs/applications/editors/vscode/vscodium.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 8baa691b5a30..da716255d230 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -1,7 +1,7 @@ { stdenv, lib, callPackage, fetchurl , isInsiders ? false , commandLineArgs ? "" -, useVSCodeRipgrep ? false +, useVSCodeRipgrep ? stdenv.isDarwin }: let diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 1dca2081b0a8..6d9ac6566372 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? false }: +{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.isDarwin }: let inherit (stdenv.hostPlatform) system;