Skip to content

Commit 7b0ff73

Browse files
authored
fix(nix): buildVscodeExtension requires pname (#463)
1 parent 35b72d7 commit 7b0ff73

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/default.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
validWorkbenchModes = properties."catppuccin.workbenchMode".enum;
2020
validBracketModes = properties."catppuccin.bracketMode".enum;
2121

22-
inherit (packageJSON) name version;
23-
pname = "${name}-${version}";
22+
inherit (packageJSON) version;
23+
pname = packageJSON.name;
2424

2525
options = builtins.removeAttrs inputs ["pkgs"];
2626
src = pkgs.nix-gitignore.gitignoreSource [] (builtins.path {
27-
name = pname;
27+
name = "${pname}-${version}";
2828
path = ../.;
2929
});
3030

@@ -52,15 +52,15 @@
5252
};
5353
};
5454
vscodeExtPublisher = "catppuccin";
55-
vscodeExtName = name;
55+
vscodeExtName = pname;
5656
vscodeExtUniqueId = "${vscodeExtPublisher}.${vscodeExtName}";
5757
in
5858
(lib.throwIfNot (accentColor == null) "${pname}: deprecated option 'accentColor' is no longer supported, please use 'accent' instead.")
5959
(lib.checkListOfEnum "${pname}: accent" validAccents [accent])
6060
(lib.checkListOfEnum "${pname}: workbenchMode" validWorkbenchModes [workbenchMode])
6161
(lib.checkListOfEnum "${pname}: bracketMode" validBracketModes [bracketMode])
6262
(pkgs.vscode-utils.buildVscodeExtension {
63-
inherit name version vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
63+
inherit pname version vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
6464
src = builder.outPath;
6565

6666
buildInputs = [pkgs.nodejs];

0 commit comments

Comments
 (0)