rde: feature-citar: Fix package collision if custom org-roam. v1 PROPOSED

Nicolas Graves: 1
 rde: feature-citar: Fix package collision if custom org-roam.

 1 files changed, 7 insertions(+), 2 deletions(-)

[PATCH] rde: feature-citar: Fix package collision if custom org-roam. Export this patch

In the case where a custom org-roam package is used, we need to ensure that
having feature-citar will not create a package collision.
---
 src/rde/features/emacs-xyz.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rde/features/emacs-xyz.scm b/src/rde/features/emacs-xyz.scm
index c2a138ab..905fe389 100644
--- a/src/rde/features/emacs-xyz.scm
+++ b/src/rde/features/emacs-xyz.scm
@@ -4623,7 +4623,7 @@ marginalia annotations."
 
   (feature
    (name f-name)
-   (values `((,f-name . #t)
+   (values `((,f-name . ,emacs-org-roam)
              (org-roam-todo? . ,org-roam-todo?)))
    (home-services-getter get-home-services)))
 
@@ -4725,7 +4725,12 @@ citar-org-roam-subdir if org-roam is enabled."
       '(convenience org-mode org-cite citar references roam knowledgebase)
       #:elisp-packages
       (append
-       (if (get-value 'emacs-org-roam config) (list emacs-citar-org-roam) '())
+       (if (get-value 'emacs-org-roam config)
+           (list
+            (package/inherit emacs-citar-org-roam
+              (propagated-inputs (list (get-value 'emacs-org-roam config)
+                                       emacs-citar))))
+           '())
        (or (and=> emacs-all-the-icons list) '())
        (list emacs-citar)))))
 
-- 
2.41.0



-- 
Best regards,
Nicolas Graves