aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/editors/vscode/extensions/terraform/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ lib, vscode-utils, terraform-ls }:
vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.19.0";
sha256 = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY=";
};
patches = [ ./fix-terraform-ls.patch ];
postPatch = ''
substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
'';
meta = with lib; {
license = licenses.mit;
maintainers = with maintainers; [ rhoriguchi ];
};
}

19
pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch Normal file
View file

@ -0,0 +1,19 @@
diff --git a/out/serverPath.js b/out/serverPath.js
index fafa915..2e6d376 100644
--- a/out/serverPath.js
+++ b/out/serverPath.js
@@ -18,7 +18,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary';
class ServerPath {
constructor(context) {
this.context = context;
- this.customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME);
+
+ const customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME);
+ if (!customBinPath) {
+ this.customBinPath = 'TERRAFORM-LS-PATH';
+ } else {
+ this.customBinPath = customBinPath;
+ }
}
installPath() {
return path.join(this.context.globalStorageUri.fsPath, INSTALL_FOLDER_NAME);