mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

modules/output: move symlinkJoin to build.package

Browse source
This commit is contained in:
Matt Sturgeon 2025-01-20 13:50:50 +00:00
parent 731699a24c
commit 00586f8f1b
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
7 changed files with 62 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

46
modules/top-level/output.nix
View file

@ -113,6 +113,15 @@ in
readOnly = true;
};
nvimPackage = mkOption {
type = types.package;
description = ''
Wrapped Neovim (without man-docs, printInitPackage, etc).
'';
readOnly = true;
internal = true;
};
initFile = mkOption {
type = types.path;
description = ''
@ -310,10 +319,10 @@ in
}
);
wrappedNeovim' = pkgs.wrapNeovimUnstable package neovimConfig;
wrappedNeovim = pkgs.wrapNeovimUnstable package neovimConfig;
customRC = helpers.concatNonEmptyLines [
(helpers.wrapVimscriptForLua wrappedNeovim'.initRc)
(helpers.wrapVimscriptForLua wrappedNeovim.initRc)
config.content
];
@ -356,20 +365,33 @@ in
}
else
config.package;
wrappedNeovim = wrappedNeovim'.override (prev: {
wrapperArgs =
(if lib.isString prev.wrapperArgs then prev.wrapperArgs else lib.escapeShellArgs prev.wrapperArgs)
+ " "
+ extraWrapperArgs;
wrapRc = false;
});
in
{
build = {
package = config.build.packageUnchecked;
packageUnchecked = wrappedNeovim;
inherit initFile initSource;
package = config.build.packageUnchecked;
nvimPackage = wrappedNeovim.override (prev: {
wrapperArgs =
(if lib.isString prev.wrapperArgs then prev.wrapperArgs else lib.escapeShellArgs prev.wrapperArgs)
+ " "
+ extraWrapperArgs;
wrapRc = false;
});
packageUnchecked = pkgs.symlinkJoin {
name = "nixvim";
paths =
with config.build;
[
nvimPackage
printInitPackage
]
++ lib.optionals config.enableMan [
manDocsPackage
];
meta.mainProgram = "nvim";
};
printInitPackage = pkgs.writeShellApplication {
name = "nixvim-print-init";