From 78ea855197b2fb7d7217f8c8ec4cbd301c22169d Mon Sep 17 00:00:00 2001 From: TEC Date: Thu, 3 Jun 2021 15:52:44 +0800 Subject: [PATCH] Org: Fix omissions from recipe Content lifted from: https://github.com/hlissner/doom-emacs/blob/develop/modules/lang/org/packages.el --- config.org | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/config.org b/config.org index b4330bf..ebd9fcd 100644 --- a/config.org +++ b/config.org @@ -1651,17 +1651,22 @@ correct package statement needed. (= 0 (shell-command "cat ~/.ssh/id_ed25519.pub | grep -q AAAAC3NzaC1lZDI1NTE5AAAAIOZZqcJOLdN+QFHKyW8ST2zz750+8TdvO9IT5geXpQVt")))) (dev-pkg (let ((default-directory (expand-file-name "straight/repos/org-mode" doom-local-dir))) (and (file-exists-p default-directory) - (string= "git@code.orgmode.org:bzg/org-mode.git\n" (shell-command-to-string "git remote get-url origin")))))) + (string= "git@code.orgmode.org:bzg/org-mode.git\n" (shell-command-to-string "git remote get-url origin"))))) + (recipe-common '(:files ("*.el" "lisp/*.el") + :pre-build + (with-temp-file (doom-path (straight--repos-dir "org-mode") "org-version.el") + (insert "(fset 'org-release (lambda () \"9.5\"))\n" + "(fset 'org-git-version #'ignore)\n" + "(provide 'org-version)\n")) + :includes org))) (prin1-to-string (cond ((and dev-key dev-pkg) `(package! org-mode - :recipe (:local-repo ,(expand-file-name "straight/repos/org-mode" doom-local-dir) - :files ("*.el" "lisp/*.el")) + :recipe (:local-repo ,(expand-file-name "straight/repos/org-mode" doom-local-dir) ,@recipe-common) :pin nil)) (dev-key `(package! org-mode - :recipe (:host nil :repo "git@code.orgmode.org:bzg/org-mode.git" - :files ("*.el" "lisp/*.el")) + :recipe (:host nil :repo "git@code.orgmode.org:bzg/org-mode.git" ,@recipe-common) :pin nil)) (t `(package! org-mode :pin nil))))) #+end_src