vscode-utils.buildVscodeExtension: fix cross-compilation (#519759)
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
jq,
|
||||
buildPackages,
|
||||
python3,
|
||||
moreutils,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
@@ -16,7 +15,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
${lib.getExe jq} '.contributes.configuration.properties."scheme-fmt.pythonPath".default = "${lib.getExe python3}"' package.json | ${lib.getExe' moreutils "sponge"} package.json
|
||||
${lib.getExe buildPackages.jq} '.contributes.configuration.properties."scheme-fmt.pythonPath".default = "${lib.getExe python3}"' package.json | ${lib.getExe' buildPackages.moreutils "sponge"} package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
writeShellScriptBin,
|
||||
fetchurl,
|
||||
vscode,
|
||||
buildPackages,
|
||||
unzip,
|
||||
makeSetupHook,
|
||||
writeScript,
|
||||
@@ -15,7 +16,7 @@ let
|
||||
unpackVsixSetupHook = makeSetupHook {
|
||||
name = "unpack-vsix-setup-hook";
|
||||
substitutions = {
|
||||
unzip = "${unzip}/bin/unzip";
|
||||
unzip = "${buildPackages.unzip}/bin/unzip";
|
||||
};
|
||||
} ./unpack-vsix-setup-hook.sh;
|
||||
buildVscodeExtension = lib.extendMkDerivation {
|
||||
|
||||
Reference in New Issue
Block a user