Unload seq before elpaca build, redefine zig-compile

This commit is contained in:
Andrew Scott 2024-01-13 01:07:16 -05:00
parent c5e5883a9a
commit d48e13dd41
Signed by: a
GPG key ID: 7CD5A5977E4931C1

View file

@ -78,6 +78,17 @@
(add-hook 'after-init-hook #'elpaca-process-queues) (add-hook 'after-init-hook #'elpaca-process-queues)
(elpaca `(,@elpaca-order)) (elpaca `(,@elpaca-order))
;; Unload seq before elpaca build - also see `use-package' declaration for seq below
;; https://github.com/progfolio/elpaca/issues/216#issuecomment-1868444883
(defun +elpaca-unload-seq (e)
(and (featurep 'seq) (unload-feature 'seq t))
(elpaca--continue-build e))
(defun +elpaca-seq-build-steps ()
(append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory))
elpaca--pre-built-steps elpaca-build-steps))
(list '+elpaca-unload-seq 'elpaca--activate-package)))
;; use-package ;; use-package
(elpaca elpaca-use-package (elpaca elpaca-use-package
(elpaca-use-package-mode) (elpaca-use-package-mode)
@ -231,6 +242,10 @@
(setq save-place-file (concat xdg_cache_home "places")) (setq save-place-file (concat xdg_cache_home "places"))
(save-place-mode)) (save-place-mode))
(use-package seq
; Unload seq before elpaca build
:elpaca `(seq :build ,(+elpaca-seq-build-steps)))
(use-package simple (use-package simple
:elpaca nil :elpaca nil
:config :config
@ -708,7 +723,12 @@
;; Zig ;; Zig
(use-package zig-mode (use-package zig-mode
:commands (zig-mode) :commands (zig-mode)
:config (setq-local fill-column 100)) :config
(defun zig-compile ()
(interactive)
(save-buffer)
(zig--run-cmd "build"))
(setq-local fill-column 100))
;;; File format/markup support ;;; File format/markup support
(use-package markdown-mode (use-package markdown-mode