start fixing CI; this gets a bit further into the build

nix-integration.patch

@@ -1,67 +1,65 @@
-From 414206d3dd6ef3995fff67a89f26f13b0f0e1bf9 Mon Sep 17 00:00:00 2001
+From e1a22ff755ee961d4981134b8bcbfabedcf67bee Mon Sep 17 00:00:00 2001
 From: ckie <git-525ff67@ckie.dev>
-Date: Mon, 27 Dec 2021 23:15:28 +0200
-Subject: [PATCH] nix integration
+Date: Fri, 1 Jul 2022 16:09:11 +0300
+Subject: [PATCH] Nix integration
 
 ---
- core/core-cli.el | 4 ++--
- core/core.el     | 7 ++++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
+ core/core-cli-lib.el | 2 +-
+ core/core.el         | 8 +++++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/core/core-cli.el b/core/core-cli.el
-index 2ebd05ed6..fc49eb74f 100644
---- a/core/core-cli.el
-+++ b/core/core-cli.el
-@@ -15,10 +15,10 @@ These are loaded when a Doom's CLI starts up. There users and modules can define
- additional CLI commands, or reconfigure existing ones to better suit their
- purpose.")
+diff --git a/core/core-cli-lib.el b/core/core-cli-lib.el
+index 5881bb564..8d5a9381d 100644
+--- a/core/core-cli-lib.el
++++ b/core/core-cli-lib.el
+@@ -111,7 +111,7 @@ If nil, falls back to less.")
  
--(defvar doom-cli-log-file (concat doom-local-dir "doom.log")
-+(defvar doom-cli-log-file (concat doom-cache-dir "doom.log")
-   "Where to write the extended output to.")
+ Only applies if (exit! :pager) or (exit! :pager?) are called.")
  
--(defvar doom-cli-log-error-file (concat doom-local-dir "doom.error.log")
-+(defvar doom-cli-log-error-file (concat doom-cache-dir "doom.error.log")
-   "Where to write the last backtrace to.")
+-(defvar doom-cli-log-file-format (expand-file-name "logs/cli.%s.%s.%s" doom-local-dir)
++(defvar doom-cli-log-file-format (expand-file-name "logs/cli.%s.%s.%s" doom-cache-dir)
+   "Where to write any output/log file to.
  
- (defvar doom--cli-log-buffer (generate-new-buffer " *doom log*"))
+ Must have two arguments, one for session id and the other for log type.")
 diff --git a/core/core.el b/core/core.el
-index c74f5b031..bbc5bab9c 100644
+index 07254e602..cb80b0991 100644
 --- a/core/core.el
 +++ b/core/core.el
-@@ -68,7 +68,7 @@ envvar will enable this at startup.")
+@@ -143,7 +143,7 @@ envvar will enable this at startup.")
  (defconst doom-local-dir
    (if-let (localdir (getenv-internal "DOOMLOCALDIR"))
        (expand-file-name (file-name-as-directory localdir))
 -    (concat doom-emacs-dir ".local/"))
-+    (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.
-@@ -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
+@@ -152,14 +152,15 @@ 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.")
  
+ ;; DEPRECATED
 -(defconst doom-etc-dir (concat doom-local-dir "etc/")
-+(defconst doom-etc-dir "~/.local/doom/"
++; nix-doom-emacs: This doesn't meet XDG but backwards compatibility is a thing.
++(defconst doom-etc-dir (concat doom-local-dir "~/.local/doom")
    "Directory for non-volatile local storage.
  
  Use this for files that don't change much, like server binaries, external
  dependencies or long-term shared data. Must end with a slash.")
  
+ ;; DEPRECATED
 -(defconst doom-cache-dir (concat doom-local-dir "cache/")
-+(defconst doom-cache-dir "~/.cache/doom/"
++(defconst doom-cache-dir (concat doom-local-dir "~/.cache/doom")
    "Directory for volatile local storage.
  
  Use this for files that change often, like cache files. Must end with a slash.")
-@@ -160,6 +160,7 @@ users).")
-   ;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
-   ;; when upgrading Doom).
+@@ -238,6 +239,7 @@ users).")
+   ;; Don't store eln files in ~/.emacs.d/eln-cache (where they can easily be
+   ;; deleted by 'doom upgrade').
    (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/"))
  
    (with-eval-after-load 'comp
      ;; HACK Disable native-compilation for some troublesome packages
 -- 
-2.33.0
+2.36.1