From daa739e6f5f1754d9861924018569131beb3bf88 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 25 May 2024 05:39:51 +0200
Subject: Emacs: set eln cache directory properly

1. It needs to be set in early-init.el
2. It should not be the last value of `native-comp-eln-load-path`, as
that is expected to be a system directory
---
 user/emacs/early-init.el | 5 +++++
 user/settings/emacs.nix  | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/user/emacs/early-init.el b/user/emacs/early-init.el
index 8617e3f2..d24c661d 100644
--- a/user/emacs/early-init.el
+++ b/user/emacs/early-init.el
@@ -4,6 +4,11 @@
       frame-inhibit-implied-resize t
       byte-compile-warnings '(not free-vars unresolved noruntime lexical make-local cl-functions))
 
+(require 'xdg)
+(startup-redirect-eln-cache
+ (expand-file-name "emacs/native-compile"
+                   (xdg-cache-home)))
+
 ;; Disable all the bars, unless on macOS, in which case, keep the menu bar.
 (unless (eq window-system 'ns)
   (menu-bar-mode -1))
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 5ed9eb4f..7f681bd1 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -6,8 +6,6 @@
 let
   inherit (pkgs) stdenv;
 
-  nativeCompileDirectory = "${config.xdg.cacheHome}/emacs/native-compile/";
-
   editorScript = pkgs.writeScriptBin "edit" ''
     #!${pkgs.runtimeShell}
     if [ -z "$1" ]; then
@@ -199,9 +197,6 @@ in
     extraConfig = ''
       (with-eval-after-load 'editorconfig
         (defvar editorconfig-exec-path "${pkgs.editorconfig-core-c}/bin/editorconfig"))
-      (when (featurep 'native-compile)
-        (defvar native-compile-target-directory "${nativeCompileDirectory}")
-        (add-to-list 'native-comp-eln-load-path "${nativeCompileDirectory}" :append))
     '' + lib.optionalString stdenv.isDarwin ''
       (with-eval-after-load 'files
         (defvar insert-directory-program "${pkgs.coreutils-prefixed}/bin/gls"))
-- 
cgit 1.4.1