Unverified Commit c96d13f0 authored by Acid Bong's avatar Acid Bong
Browse files

emacs: add `lexical-binding: t` to files, generated by emacs.pkgs.withPackages 

Emacs30 now complains if lexical binding isn't specified (t for modern
dialects, nil for older ones[^1]) in compiled .el files. This patch
prevents the warnings for `site-start.el` and `subdirs.el`.

[^1]: https://www.gnu.org/software/emacs/manual/html_node/elisp/Selecting-Lisp-Dialect.html
parent 59acba6d

pkgs/applications/editors/emacs/build-support/wrapper.nix

+5 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ runCommand (lib.appendToName "with-packages" emacs).name 
          # buffer.

          rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled

          cat >"$siteStart" <<EOF

          ;;; -*- lexical-binding: t -*-

          (let ((inhibit-message t))

            (load "$emacs/share/emacs/site-lisp/site-start"))

          ;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh
@@ -175,11 +176,14 @@ runCommand (lib.appendToName "with-packages" emacs).name 
          EOF



          # Generate a subdirs.el that statically adds all subdirectories to load-path.

          cat >"$subdirs" <<EOF

          ;;; -*- lexical-binding: t -*-

          EOF

          $emacs/bin/emacs \

            --batch \

            --load ${./mk-wrapper-subdirs.el} \

            --eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \

            > "$subdirs"

            >> "$subdirs"



          # Byte-compiling improves start-up time only slightly, but costs nothing.

          $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"