pyrox.dev
Merge pull request #127996 from cideM/fix-vscode
vscode: fix source name
+5
-2
pkgs/applications/editors/vscode/generic.nix
+5
-2
pkgs/applications/editors/vscode/generic.nix
···
10
# Attributes inherit from specific versions
11
, version, src, meta, sourceRoot
12
, executableName, longName, shortName, pname, updateScript
13
}:
14
15
let
···
77
'' + (if system == "x86_64-darwin" then ''
78
mkdir -p "$out/Applications/${longName}.app" $out/bin
79
cp -r ./* "$out/Applications/${longName}.app"
80
-
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${executableName}" $out/bin/${executableName}
81
'' else ''
82
mkdir -p $out/lib/vscode $out/bin
83
cp -r ./* $out/lib/vscode
84
85
-
ln -s $out/lib/vscode/bin/${executableName} $out/bin
86
87
mkdir -p $out/share/applications
88
ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop
···
10
# Attributes inherit from specific versions
11
, version, src, meta, sourceRoot
12
, executableName, longName, shortName, pname, updateScript
13
+
# sourceExecutableName is the name of the binary in the source archive, over
14
+
# which we have no control
15
+
, sourceExecutableName ? executableName
16
}:
17
18
let
···
80
'' + (if system == "x86_64-darwin" then ''
81
mkdir -p "$out/Applications/${longName}.app" $out/bin
82
cp -r ./* "$out/Applications/${longName}.app"
83
+
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" $out/bin/${executableName}
84
'' else ''
85
mkdir -p $out/lib/vscode $out/bin
86
cp -r ./* $out/lib/vscode
87
88
+
ln -s $out/lib/vscode/bin/${sourceExecutableName} $out/bin/${executableName}
89
90
mkdir -p $out/share/applications
91
ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop
+1
pkgs/applications/editors/vscode/vscode.nix
+1
pkgs/applications/editors/vscode/vscode.nix
···
25
version = "1.57.1";
26
pname = "vscode";
27
28
+
sourceExecutableName = "code";
29
executableName = "code" + lib.optionalString isInsiders "-insiders";
30
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
31
shortName = "Code" + lib.optionalString isInsiders " - Insiders";