From 8458a6c6f12ae17ce0b601be5b8a9c7629280080 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 7 Apr 2025 16:03:09 +0200
Subject: [PATCH] modules/dependencies: add gcc

---
 modules/dependencies.nix               |  1 +
 plugins/by-name/treesitter/default.nix | 16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/modules/dependencies.nix b/modules/dependencies.nix
index 9b10e449..0a1e28bd 100644
--- a/modules/dependencies.nix
+++ b/modules/dependencies.nix
@@ -9,6 +9,7 @@ let
 
   packages = {
     curl.default = "curl";
+    gcc.default = "gcc";
     git = {
       default = "git";
       example = [ "gitMinimal" ];
diff --git a/plugins/by-name/treesitter/default.nix b/plugins/by-name/treesitter/default.nix
index b57ff11e..8e1ecc36 100644
--- a/plugins/by-name/treesitter/default.nix
+++ b/plugins/by-name/treesitter/default.nix
@@ -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"
         ]