BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #247130 from Artturin/upddoc

Browse source
This commit is contained in:
Artturi 2023-08-04 22:49:33 +03:00 committed by GitHub
commit f504a532bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/stdenv/meta.chapter.md
View file

@ -70,7 +70,7 @@ A list of the maintainers of this Nix expression. Maintainers are defined in [`n
### `mainProgram` {#var-meta-mainProgram}
The name of the main binary for the package. This affects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"`
The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"`
### `priority` {#var-meta-priority}

5
lib/meta.nix
View file

@ -132,10 +132,9 @@ rec {
{ shortName = licstr; }
);
/* Get the path to the main program of a derivation with either
meta.mainProgram or pname or name
/* Get the path to the main program of a package based on meta.mainProgram
Type: getExe :: derivation -> string
Type: getExe :: package -> string
Example:
getExe pkgs.hello

5
pkgs/development/node-packages/main-programs.nix
View file

@ -1,5 +1,4 @@
# Use this file to add `meta.mainProgram` to packages in `nodePackages`, that don't provide an
# executable that matches that packages name, so that they'll work with `nix run`.
# Use this file to add `meta.mainProgram` to packages in `nodePackages`.
{
# Packages that provide multiple executables where one is clearly the `mainProgram`.
"@antfu/ni" = "ni";
@ -11,7 +10,7 @@
vue-cli = "vue";
"@withgraphite/graphite-cli" = "gt";
# Packages that provide a single executable whose name differs from the package's `name`.
# Packages that provide a single executable.
"@angular/cli" = "ng";
"@antora/cli" = "antora";
"@astrojs/language-server" = "astro-ls";

4
pkgs/tools/security/pass/default.nix
View file

@ -29,8 +29,7 @@ let
selected = [ pass ] ++ extensions passExtensions
++ lib.optional tombPluginSupport passExtensions.tomb;
in buildEnv {
# lib.getExe looks for name, so we keep it the same as mainProgram
name = "pass";
name = "pass-env";
paths = selected;
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.concatMap (x: x.buildInputs) selected;
@ -51,6 +50,7 @@ let
wrapProgram $out/bin/pass \
--set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions"
'';
meta.mainProgram = "pass";
};
in