mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-20 16:15:43 +02:00
modules/dependencies: add gcc
This commit is contained in:
parent
81874690ce
commit
8458a6c6f1
2 changed files with 7 additions and 10 deletions
|
@ -9,6 +9,7 @@ let
|
|||
|
||||
packages = {
|
||||
curl.default = "curl";
|
||||
gcc.default = "gcc";
|
||||
git = {
|
||||
default = "git";
|
||||
example = [ "gitMinimal" ];
|
||||
|
|
|
@ -230,6 +230,10 @@ lib.nixvim.plugins.mkNeovimPlugin {
|
|||
))
|
||||
|
||||
# TODO: added 2025-04-07, remove after 25.05
|
||||
(lib.nixvim.mkRemovedPackageOptionModule {
|
||||
plugin = "treesitter";
|
||||
packageName = "gcc";
|
||||
})
|
||||
(lib.nixvim.mkRemovedPackageOptionModule {
|
||||
plugin = "treesitter";
|
||||
packageName = "nodejs";
|
||||
|
@ -370,12 +374,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
|
|||
extraOptions = {
|
||||
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 {
|
||||
type = with types; listOf package;
|
||||
default = config.plugins.treesitter.package.passthru.allGrammars;
|
||||
|
@ -449,11 +447,8 @@ lib.nixvim.plugins.mkNeovimPlugin {
|
|||
pkg: pkg.withPlugins (_: cfg.grammarPackages)
|
||||
);
|
||||
|
||||
extraPackages = [
|
||||
cfg.gccPackage
|
||||
];
|
||||
|
||||
dependencies = lib.mkIf (!cfg.nixGrammars) {
|
||||
gcc.enable = lib.mkDefault true;
|
||||
nodejs.enable = lib.mkDefault true;
|
||||
tree-sitter.enable = lib.mkDefault true;
|
||||
};
|
||||
|
@ -467,6 +462,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
|
|||
'';
|
||||
})
|
||||
[
|
||||
"gcc"
|
||||
"nodejs"
|
||||
"tree-sitter"
|
||||
]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue