diff options
| author | Brian Leung <leungbk@posteo.net> | 2022-12-02 19:23:45 -0800 |
|---|---|---|
| committer | Brian Leung <leungbk@posteo.net> | 2022-12-02 19:25:25 -0800 |
| commit | 0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f (patch) | |
| tree | c6fcb45a3811a44114863387a707bdfc12b9f8c7 /overlays | |
| parent | 2b59221ede94cce7db3aef6e2bfb707c1ddc5e70 (diff) | |
| download | nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.tar nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.tar.gz nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.tar.bz2 nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.tar.lz nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.tar.xz nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.tar.zst nixlib-0743ae0eb85b4e1087fc20fd0c9bcf8efb1fdc4f.zip | |
Add Darwin notes for tree-sitter
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/emacs.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix index a3f92c64946e..ab16a7250416 100644 --- a/overlays/emacs.nix +++ b/overlays/emacs.nix @@ -78,6 +78,7 @@ let linkCmd = drv: if super.stdenv.isDarwin then ''cp ${drv}/parser $out/lib/${lib drv} + # FIXME: Is this kosher? /usr/bin/install_name_tool -id $out/lib/${lib drv} $out/lib/${lib drv} /usr/bin/codesign -s - -f $out/lib/${lib drv} '' @@ -104,7 +105,12 @@ let # bundled in emacs to be dynamically loaded. TREE_SITTER_LIBS = super.lib.concatStringsSep " " ([ "-ltree-sitter" ] ++ (map linkerFlag plugins)); # Add to directories that tree-sitter looks in for language definitions / shared object parsers - postPatch = old.postPatch + '' + # FIXME: This was added for macOS, but it shouldn't be necessary on any platform. + # https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n533 + # appends a bunch of filenames that appear to be incorrectly skipped over + # in https://git.savannah.gnu.org/cgit/emacs.git/tree/src/treesit.c?h=64044f545add60e045ff16a9891b06f429ac935f#n567 + # on macOS, but are handled properly in Linux. + postPatch = old.postPatch + super.lib.optionalString super.stdenv.isDarwin '' substituteInPlace src/treesit.c \ --replace "Vtreesit_extra_load_path = Qnil;" \ "Vtreesit_extra_load_path = list1 ( build_string ( \"${tree-sitter-grammars}/lib\" ) );" |