BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #241697 from tricktron/fix-vscode-insiders

Browse source 
vscode: fix vscode-insiders on darwin
This commit is contained in:
Mario Rodas 2023-08-08 07:54:21 -05:00 committed by GitHub
commit 0f9c200e21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/vscode/generic.nix
View file

@ -15,11 +15,7 @@
, executableName, longName, shortName, pname, updateScript
, dontFixup ? false
, rev ? null, vscodeServer ? null
# sourceExecutableName is the name of the binary in the source archive, over
# which we have no control
, sourceExecutableName ? executableName
, useVSCodeRipgrep ? false
, ripgrep
}:

10
pkgs/applications/editors/vscode/vscode.nix
View file

@ -5,6 +5,12 @@
, nixosTests
, srcOnly
, isInsiders ? false
# sourceExecutableName is the name of the binary in the source archive over
# which we have no control and it is needed to run the insider version as
# documented in https://nixos.wiki/wiki/Visual_Studio_Code#Insiders_Build
# On MacOS the insider binary is still called code instead of code-insiders as
# of 2023-08-06.
, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders"
, commandLineArgs ? ""
, useVSCodeRipgrep ? stdenv.isDarwin
}:
@ -35,7 +41,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.81.0";
pname = "vscode";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "6445d93c81ebe42c4cbd7a60712e0b17d9463e97";
@ -43,7 +49,7 @@ in
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
shortName = "Code" + lib.optionalString isInsiders " - Insiders";
inherit commandLineArgs useVSCodeRipgrep;
inherit commandLineArgs useVSCodeRipgrep sourceExecutableName;
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";