fix(nix): buildVscodeExtension requires pname (#463)

This commit is contained in:
Brian Li 2024-12-01 23:14:25 +08:00 committed by GitHub
parent 35b72d7f39
commit 7b0ff73aa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions

6
flake.lock generated
View File

@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"lastModified": 1732837521,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github"
},
"original": {

View File

@ -19,12 +19,12 @@
validWorkbenchModes = properties."catppuccin.workbenchMode".enum;
validBracketModes = properties."catppuccin.bracketMode".enum;
inherit (packageJSON) name version;
pname = "${name}-${version}";
inherit (packageJSON) version;
pname = packageJSON.name;
options = builtins.removeAttrs inputs ["pkgs"];
src = pkgs.nix-gitignore.gitignoreSource [] (builtins.path {
name = pname;
name = "${pname}-${version}";
path = ../.;
});
@ -52,7 +52,7 @@
};
};
vscodeExtPublisher = "catppuccin";
vscodeExtName = name;
vscodeExtName = pname;
vscodeExtUniqueId = "${vscodeExtPublisher}.${vscodeExtName}";
in
(lib.throwIfNot (accentColor == null) "${pname}: deprecated option 'accentColor' is no longer supported, please use 'accent' instead.")
@ -60,7 +60,7 @@ in
(lib.checkListOfEnum "${pname}: workbenchMode" validWorkbenchModes [workbenchMode])
(lib.checkListOfEnum "${pname}: bracketMode" validBracketModes [bracketMode])
(pkgs.vscode-utils.buildVscodeExtension {
inherit name version vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
inherit pname version vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
src = builder.outPath;
buildInputs = [pkgs.nodejs];