diff options
| author | Yilin Wei <yilin@kebab-ca.se> | 2022-10-17 09:14:42 +0100 |
|---|---|---|
| committer | Yilin Wei <yilin@kebab-ca.se> | 2022-10-17 09:14:42 +0100 |
| commit | c1143602cb97fa717bacdf5668ceca1bb487918d (patch) | |
| tree | f0f73ea41a9786dda4e21738927bbca127a57bc1 /overlays | |
| parent | a828f7f2ea3f79110b26ea40763326cd788e43e3 (diff) | |
| download | nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.tar nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.tar.gz nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.tar.bz2 nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.tar.lz nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.tar.xz nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.tar.zst nixlib-c1143602cb97fa717bacdf5668ceca1bb487918d.zip | |
address comments
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/emacs.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix index 72fa6b0d1487..ca745409707d 100644 --- a/overlays/emacs.nix +++ b/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 ]); }; |