alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #201548 from figsoda/treesitter-deps

Browse source 
vimPlugins.nvim-treesitter: add plugins to dependencies to avoid extending vimPlugins
This commit is contained in:
figsoda 2022-11-17 19:11:21 -05:00 committed by GitHub
parent a5e9371adb 185a04dc3e
commit 1d6d5f975d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
View file

@ -34,15 +34,28 @@ let
# or for all grammars: # or for all grammars:
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars # pkgs.vimPlugins.nvim-treesitter.withAllGrammars
withPlugins = withPlugins =
grammarFn: self.nvim-treesitter.overrideAttrs (_: { f: self.nvim-treesitter.overrideAttrs (_: {
postPatch = passthru.dependencies = map
let (grammar:
grammars = tree-sitter.withPlugins (ps: grammarFn (ps // builtGrammars)); let
in name = lib.pipe grammar [
'' lib.getName
rm -r parser
ln -s ${grammars} parser # added in buildGrammar
''; (lib.removeSuffix "-grammar")
# grammars from tree-sitter.builtGrammars
(lib.removePrefix "tree-sitter-")
(lib.replaceStrings [ "-" ] [ "_" ])
];
in
runCommand "nvim-treesitter-${name}-grammar" { } ''
mkdir -p $out/parser
ln -s ${grammar}/parser $out/parser/${name}.so
''
)
(f (tree-sitter.builtGrammars // builtGrammars));
}); });
withAllGrammars = withPlugins (_: allGrammars); withAllGrammars = withPlugins (_: allGrammars);
@ -79,4 +92,3 @@ in
meta.maintainers = with lib.maintainers; [ figsoda ]; meta.maintainers = with lib.maintainers; [ figsoda ];
} }