awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-03 12:27:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

nix-integration: update patch

Browse Source
This commit is contained in:
ckie
2021-12-09 16:35:36 +02:00
parent 258b70a441
commit 29688ccca5
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
nix-integration.patch
View File

@ -1,17 +1,17 @@
diff --git a/core/core.el b/core/core.el diff --git a/core/core.el b/core/core.el
index a5f7664db..894c1d641 100644 index c74f5b031..9ee1687fb 100644
--- a/core/core.el --- a/core/core.el
+++ b/core/core.el +++ b/core/core.el
@@ -75,7 +75,7 @@ envvar will enable this at startup.") @@ -68,7 +68,7 @@ envvar will enable this at startup.")
(let ((localdir (getenv-internal "DOOMLOCALDIR"))) (defconst doom-local-dir
(if localdir (if-let (localdir (getenv-internal "DOOMLOCALDIR"))
(expand-file-name (file-name-as-directory localdir)) (expand-file-name (file-name-as-directory localdir))
- (concat doom-emacs-dir ".local/"))) - (concat doom-emacs-dir ".local/"))
+ (concat doom-emacs-dir "@local@/"))) + (concat doom-emacs-dir "@local@/"))
"Root directory for local storage. "Root directory for local storage.
Use this as a storage location for this system's installation of Doom Emacs. Use this as a storage location for this system's installation of Doom Emacs.
@@ -83,13 +83,13 @@ Use this as a storage location for this system's installation of Doom Emacs. @@ -76,13 +76,13 @@ Use this as a storage location for this system's installation of Doom Emacs.
These files should not be shared across systems. By default, it is used by These files should not be shared across systems. By default, it is used by
`doom-etc-dir' and `doom-cache-dir'. Must end with a slash.") `doom-etc-dir' and `doom-cache-dir'. Must end with a slash.")
@ -27,13 +27,11 @@ index a5f7664db..894c1d641 100644
"Directory for volatile local storage. "Directory for volatile local storage.
Use this for files that change often, like cache files. Must end with a slash.") Use this for files that change often, like cache files. Must end with a slash.")
@@ -175,7 +175,8 @@ users).") @@ -160,6 +160,7 @@ users).")
;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged ;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
;; when upgrading Doom). ;; when upgrading Doom).
(when (boundp 'native-comp-eln-load-path) (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))
- (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))) + (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "cache/eln/"))
+ (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))
+ (add-to-list 'native-comp-eln-load-path (concat doom-local-dir "cache/eln/")))
(with-eval-after-load 'comp (with-eval-after-load 'comp
;; HACK Disable native-compilation for some troublesome packages ;; HACK Disable native-compilation for some troublesome packages