From 2d324ed8f96721b74c3a232ffd4bf5af1497405b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 26 Aug 2023 14:25:11 +0800 Subject: [PATCH] emacs: fix the detection of native compilation for Emacs 29 In Emacs 29, feature comp does not load early enough. We use native-compile instead. This is also what Emacs uses[1]. [1]: https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n586 --- pkgs/applications/editors/emacs/site-start.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 668b76cfd3e8..731b42c637e1 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -40,7 +40,7 @@ least specific (the system profile)" (mapconcat 'identity new-env-list ":")))))) ;;; Set up native-comp load path. -(when (featurep 'comp) +(when (featurep 'native-compile) ;; Append native-comp subdirectories from `NIX_PROFILES'. (setq native-comp-eln-load-path (append (mapcar (lambda (profile-dir)