Commit 7b47ad2d authored by jopejoe1's avatar jopejoe1
Browse files

vscode-extensions: set pname

parent 61446222
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
  See the release notes of
  [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
  for more information.
- `vscode-utils.buildVscodeExtension` now requires pname as an argument

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ let
  };
in
vscode-utils.buildVscodeExtension {
  inherit version vsix;
  name = "${pname}-${version}";
  inherit version vsix pname;
  src = "${vsix}/${pname}.zip";
  vscodeExtUniqueId = "${publisher}.${pname}";
  vscodeExtPublisher = publisher;
+7 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
let
  buildVscodeExtension =
    a@{
      name,
      pname,
      src,
      # Same as "Unique Identifier" on the extension's web page.
      # For the moment, only serve as unique extension dir.
@@ -33,10 +33,13 @@ let
      ...
    }:
    stdenv.mkDerivation (
      (removeAttrs a [ "vscodeExtUniqueId" ])
      (removeAttrs a [
        "vscodeExtUniqueId"
        "pname"
      ])
      // {

        name = "vscode-extension-${name}";
        pname = "vscode-extension-${pname}";

        passthru = passthru // {
          inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
@@ -88,7 +91,7 @@ let
        "vsix"
      ])
      // {
        name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}";
        pname = "${mktplcRef.publisher}-${mktplcRef.name}";
        version = mktplcRef.version;
        src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef;
        vscodeExtPublisher = mktplcRef.publisher;