From 59a147780b55787b12d8436ce67b8d5b8e467a42 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 25 May 2026 16:49:30 +0200
Subject: [PATCH 1/2] tree-sitter-grammars: move env variable into env for
 structuredAttrs

---
 .../tr/tree-sitter/grammars/build-grammar.nix  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix b/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
index 4694916fbc6f..881b78756850 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
@@ -30,14 +30,16 @@ stdenv.mkDerivation (
       tree-sitter
     ];
 
-    CFLAGS = [
-      "-Isrc"
-      "-O2"
-    ];
-    CXXFLAGS = [
-      "-Isrc"
-      "-O2"
-    ];
+    env = {
+      CFLAGS = toString [
+        "-Isrc"
+        "-O2"
+      ];
+      CXXFLAGS = toString [
+        "-Isrc"
+        "-O2"
+      ];
+    };
 
     stripDebugList = [ "parser" ];
 

From 8ee15adfece7d34ce1de614e6a40bb469da01d54 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 25 May 2026 18:55:17 +0200
Subject: [PATCH 2/2] tree-sitter-grammars: set __structuredAttrs

---
 pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix b/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
index 881b78756850..478a0893b72b 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation (
 
     inherit version src;
 
+    __structuredAttrs = true;
+
     nativeBuildInputs = [
       jq
     ]