emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Manually finalize straight transactions

Browse source 
Straight expects to be used interactively, which don't do (yet). Its
transactional system depends on idle timers, which don't run in a
noninteractive session, so we have to nudge it ourselves.
This commit is contained in:
Henrik Lissner 2019-07-25 17:20:53 +02:00
parent 2aa7dbfb27
commit bdcb156b91
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/cli/packages.el
View file

@ -6,6 +6,7 @@
(doom-reload-core-autoloads) (doom-reload-core-autoloads)
(when (progn ,@body) (when (progn ,@body)
(doom-reload-package-autoloads 'force-p)) (doom-reload-package-autoloads 'force-p))
(doom--finalize-straight)
t)) t))

6
core/core-packages.el
View file

@ -116,6 +116,10 @@ missing) and shouldn't be deleted.")
(let ((user-emacs-directory doom-local-dir)) (let ((user-emacs-directory doom-local-dir))
(apply orig-fn args))) (apply orig-fn args)))
(defun doom--finalize-straight ()
(mapc #'funcall (delq nil (mapcar #'cdr straight--transaction-alist)))
(setq straight--transaction-alist nil))
;; ;;
;;; Bootstrapper ;;; Bootstrapper
@ -140,7 +144,7 @@ necessary package metadata is initialized and available for them."
:branch ,straight-repository-branch)) :branch ,straight-repository-branch))
(mapc #'straight-use-package doom-core-packages) (mapc #'straight-use-package doom-core-packages)
(when noninteractive (when noninteractive
(add-hook 'kill-emacs-hook #'straight--transaction-finalize)) (add-hook 'kill-emacs-hook #'doom--finalize-straight))
(dolist (package (straight--directory-files (straight--build-dir))) (dolist (package (straight--directory-files (straight--build-dir)))
(add-to-list 'load-path (directory-file-name (straight--build-dir package))))) (add-to-list 'load-path (directory-file-name (straight--build-dir package)))))
(when (or force-p (not doom-packages)) (when (or force-p (not doom-packages))