address comments

Author: yilinwei

overlays/emacs.nix

@@ -76,11 +76,11 @@ let
             lib = drv: ''lib${libName drv}.so'';
             linkCmd = drv: "ln -s ${drv}/parser $out/lib/${lib drv}";
             linkerFlag = drv: "-l" + libName drv;
-            plugins = args.withTreeSitterPlugins super.pkgs.tree-sitter-grammars;
-            tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {
-            } (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
+            plugins = args.withTreeSitterPlugins self.pkgs.tree-sitter-grammars;
+            tree-sitter-grammars = super.runCommand "tree-sitter-grammars" {}
+              (super.lib.concatStringsSep "\n" (["mkdir -p $out/lib"] ++ (map linkCmd plugins)));
           in {
-            buildInputs = old.buildInputs ++ [ super.pkgs.tree-sitter tree-sitter-grammars ];
+            buildInputs = old.buildInputs ++ [ self.pkgs.tree-sitter tree-sitter-grammars ];
             # before building the `.el` files, we need to allow the `tree-sitter` libraries
             # bundled in emacs to be dynamically loaded.
             TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins)); 
@@ -105,7 +105,7 @@ let
     withWebP = true;
     nativeComp = true;
   };
-  
+
   emacsPgtk = mkPgtkEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json { withSQLite3 = true; withGTK3 = true; };
 
   emacsPgtkNativeComp = mkPgtkEmacs "emacs-pgtk-native-comp" ../repos/emacs/emacs-master.json { nativeComp = true; withSQLite3 = true; withGTK3 = true; };
@@ -118,6 +118,7 @@ let
       tree-sitter-python
       tree-sitter-javascript
       tree-sitter-json
+      tree-sitter-tsx
     ]);
   };
 

repos/emacs/emacs-feature_tree-sitter.json

@@ -1 +1 @@
-{"type": "savannah", "repo": "emacs", "rev": "57e37e9128b4f6f9a2aae0bc25de6c208d58e5d0", "sha256": "1h6zicpj6bym4nclcgwvjbdisi1v5psvmpz1lik7ha85jdscpnd2", "version": "20221010.0"}
+{"type": "savannah", "repo": "emacs", "rev": "260e47e9a3c9b3baecef81e69c218989dc0cd7a4", "sha256": "1j5pbrp1bb5q6vn5ykdim8jvxj466gh1i6brl5baphr3a2cvvja8", "version": "20221017.0"}