about summary refs log tree commit diff
path: root/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-11-14 23:22:24 -0500
committerfigsoda <figsoda@pm.me>2022-11-14 23:22:24 -0500
commitaf810aa23290ce98e34208fd1559f82197d0b562 (patch)
tree64e7087b257ae65ee8c28afea8ef1effff1b79ce /pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
parent73982c518162d949c28607d9e1547df691980247 (diff)
vimPlugins.nvim-treesitter: move grammar generation from fetch to grammar.nix
Diffstat (limited to 'pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py')
-rwxr-xr-xpkgs/applications/editors/vim/plugins/nvim-treesitter/update.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
index dd88d74e8f17a..d23e9b39cf15e 100755
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
@@ -75,19 +75,6 @@ def generate_grammar(item):
             generated += f"""fetchgit {{
       url = "{url}";"""
 
-    if info.get("requires_generate_from_grammar"):
-        cmd += [
-            "--arg",
-            "nativeBuildInputs",
-            "[ nodejs tree-sitter ]",
-            "--postFetch",
-            "pushd $out && tree-sitter generate && popd",
-        ]
-
-        generated += """
-      nativeBuildInputs = [ nodejs tree-sitter ];
-      postFetch = "pushd $out && tree-sitter generate && popd";"""
-
     hash = subprocess.check_output(cmd, text=True).strip()
 
     generated += f"""
@@ -100,6 +87,10 @@ def generate_grammar(item):
         generated += f"""
     location = "{location}";"""
 
+    if info.get("requires_generate_from_grammar"):
+        generated += """
+    generate = true;"""
+
     generated += """
   };
 """
@@ -109,7 +100,7 @@ def generate_grammar(item):
 
 generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
 
-{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit, nodejs, tree-sitter }:
+{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit }:
 
 {
 """