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.patch: updated to support newer doom-emacs sources

Browse Source
This commit is contained in:
László Vaskó
2020-10-16 17:18:40 +02:00
parent 2ff46d0ea4
commit 498609a590
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nix-integration.patch
View File

@ -1,8 +1,8 @@
diff --git a/core/core.el b/core/core.el
index c8cfb0495..d8ed107bd 100644
index 3516755c2..e5054a966 100644
--- a/core/core.el
+++ b/core/core.el
@@ -92,20 +92,20 @@ envvar will enable this at startup.")
@@ -97,7 +97,7 @@ envvar will enable this at startup.")
(defconst doom-local-dir
(if-let (localdir (getenv "DOOMLOCALDIR"))
(expand-file-name (file-name-as-directory localdir))
@ -11,6 +11,7 @@ index c8cfb0495..d8ed107bd 100644
"Root directory for local storage.
Use this as a storage location for this system's installation of Doom Emacs.
@@ -105,13 +105,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
`doom-etc-dir' and `doom-cache-dir'. Must end with a slash.")
@ -26,7 +27,7 @@ index c8cfb0495..d8ed107bd 100644
"Directory for volatile local storage.
Use this for files that change often, like cache files. Must end with a slash.")
@@ -276,7 +276,8 @@ config.el instead."
@@ -282,7 +282,8 @@ config.el instead."
;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
;; when upgrading Doom).
(when (boundp 'comp-eln-load-path)
@ -35,4 +36,4 @@ index c8cfb0495..d8ed107bd 100644
+ (add-to-list 'comp-eln-load-path (concat doom-local-dir "cache/eln/")))
(after! comp
;; HACK `comp-eln-load-path' isn't fully respected yet, because native
;; HACK Disable native-compilation for some troublesome packages