From 251ccbcc6b4c8a534cd7a066930b20a1586d149f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 10 Sep 2022 20:41:21 +0200 Subject: [PATCH] fix: package recipes with relative :local-repo Necessitated by 7e0c2ed, and missed in 45a66cd. This would indirectly cause "No :repo specified for package 'X'" errors for packages with a `:local-repo` relative to their packages.el file. Amend: 45a66cda6060 Ref: 7e0c2ed8a333 --- lisp/doom-packages.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/doom-packages.el b/lisp/doom-packages.el index 331449cd7..857869441 100644 --- a/lisp/doom-packages.el +++ b/lisp/doom-packages.el @@ -554,11 +554,11 @@ elsewhere." (cl-callf map-delete plist :built-in) (cl-callf plist-put plist :ignore built-in)) `(let* ((name ',name) - (plist (cdr (assq name doom-packages)))) + (plist (cdr (assq name doom-packages))) + (dir (dir!))) ;; Record what module this declaration was found in - (let* ((dir (dir!)) - (module-list (plist-get plist :modules)) - (module (doom-module-from-path dir))) + (let ((module-list (plist-get plist :modules)) + (module (doom-module-from-path dir))) (unless (member module module-list) (cl-callf plist-put plist :modules (append module-list @@ -582,7 +582,7 @@ elsewhere." (when local-repo (cl-callf plist-put plist :recipe (plist-put recipe :local-repo - (let ((local-path (expand-file-name local-repo ,(dir!)))) + (let ((local-path (expand-file-name local-repo dir))) (if (file-directory-p local-path) local-path local-repo)))))))