pyrox.dev / nixpkgs
lol
fork atom

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

Lin Jian 2d324ed8 6505082e

options
unified split
Changed files
+1 -1
pkgs
applications
editors
emacs
site-start.el
+1 -1
pkgs/applications/editors/emacs/site-start.el 
···

       
40

       
40

       
 

       
                                (mapconcat 'identity new-env-list ":"))))))


     

       
41

       
41

       
 

       



     

       
42

       
42

       
 

       
;;; Set up native-comp load path.


     

       
43

       

       
-

       
(when (featurep 'comp)


     

       

       
43

       
+

       
(when (featurep 'native-compile)


     

       
44

       
44

       
 

       
  ;; Append native-comp subdirectories from `NIX_PROFILES'.


     

       
45

       
45

       
 

       
  (setq native-comp-eln-load-path


     

       
46

       
46

       
 

       
        (append (mapcar (lambda (profile-dir)