mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-20 16:15:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

modules/dependencies: add gcc

Browse source
This commit is contained in:
Gaetan Lepage 2025-04-07 16:03:09 +02:00 • committed by nix-infra-bot
parent 81874690ce
commit 8458a6c6f1
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/dependencies.nix
View file

@ -9,6 +9,7 @@ let
packages = { packages = {
curl.default = "curl"; curl.default = "curl";
gcc.default = "gcc";
git = { git = {
default = "git"; default = "git";
example = [ "gitMinimal" ]; example = [ "gitMinimal" ];

16
plugins/by-name/treesitter/default.nix
View file

@ -230,6 +230,10 @@ lib.nixvim.plugins.mkNeovimPlugin {
)) ))
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "treesitter";
packageName = "gcc";
})
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {
plugin = "treesitter"; plugin = "treesitter";
packageName = "nodejs"; packageName = "nodejs";
@ -370,12 +374,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
extraOptions = { extraOptions = {
folding = mkEnableOption "tree-sitter based folding"; folding = mkEnableOption "tree-sitter based folding";
gccPackage = lib.mkPackageOption pkgs "gcc" {
nullable = true;
example = "pkgs.gcc14";
extraDescription = ''This is required to build grammars if you are not using `nixGrammars '';
};
grammarPackages = mkOption { grammarPackages = mkOption {
type = with types; listOf package; type = with types; listOf package;
default = config.plugins.treesitter.package.passthru.allGrammars; default = config.plugins.treesitter.package.passthru.allGrammars;
@ -449,11 +447,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
pkg: pkg.withPlugins (_: cfg.grammarPackages) pkg: pkg.withPlugins (_: cfg.grammarPackages)
); );
extraPackages = [
cfg.gccPackage
];
dependencies = lib.mkIf (!cfg.nixGrammars) { dependencies = lib.mkIf (!cfg.nixGrammars) {
gcc.enable = lib.mkDefault true;
nodejs.enable = lib.mkDefault true; nodejs.enable = lib.mkDefault true;
tree-sitter.enable = lib.mkDefault true; tree-sitter.enable = lib.mkDefault true;
}; };
@ -467,6 +462,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
''; '';
}) })
[ [
"gcc"
"nodejs" "nodejs"
"tree-sitter" "tree-sitter"
] ]