nix-integration.patch: support newer doom-emacs versions

nix-integration.patch

@@ -1,17 +1,17 @@
 diff --git a/core/core.el b/core/core.el
-index 3516755c2..e5054a966 100644
+index 961f82733..f2dac458f 100644
 --- a/core/core.el
 +++ b/core/core.el
-@@ -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))
--    (concat doom-emacs-dir ".local/"))
-+      "@local@/")
+@@ -69,7 +69,7 @@ envvar will enable this at startup.")
+   (let ((localdir (getenv-internal "DOOMLOCALDIR")))
+     (if localdir
+         (expand-file-name (file-name-as-directory localdir))
+-      (concat doom-emacs-dir ".local/")))
++      (concat doom-emacs-dir "@local@/")))
    "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.
+@@ -77,13 +77,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.")
  
@@ -27,7 +27,7 @@ index 3516755c2..e5054a966 100644
    "Directory for volatile local storage.
  
  Use this for files that change often, like cache files. Must end with a slash.")
-@@ -282,7 +282,8 @@ config.el instead."
+@@ -152,7 +152,8 @@ users).")
  ;; 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,5 +35,5 @@ index 3516755c2..e5054a966 100644
 +  (add-to-list 'comp-eln-load-path (concat doom-cache-dir "eln/"))
 +  (add-to-list 'comp-eln-load-path (concat doom-local-dir "cache/eln/")))
  
- (after! comp
+ (with-eval-after-load 'comp
    ;; HACK Disable native-compilation for some troublesome packages