diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ce0030e954..fcfd6d7dc2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -334,8 +334,10 @@ operations.") (build-system trivial-build-system) (native-inputs `(("emacs" ,emacs-minimal))) (propagated-inputs `(("dash" ,emacs-dash) + ("ghub" ,emacs-ghub) ("with-editor" ,emacs-with-editor) - ("magit" ,emacs-magit))) + ("magit" ,emacs-magit) + ("magit-popup" ,emacs-magit-popup))) (arguments `(#:modules ((guix build utils) (guix build emacs-utils)) @@ -349,6 +351,12 @@ operations.") "/bin/emacs")) (magit (string-append (assoc-ref %build-inputs "magit") "/share/emacs/site-lisp")) + (magit-popup (string-append (assoc-ref %build-inputs "magit-popup") + "/share/emacs/site-lisp/guix.d/magit-popup-" + ,(package-version emacs-magit-popup))) + (ghub (string-append (assoc-ref %build-inputs "ghub") + "/share/emacs/site-lisp/guix.d/ghub-" + ,(package-version emacs-ghub))) (dash (string-append (assoc-ref %build-inputs "dash") "/share/emacs/site-lisp/guix.d/dash-" ,(package-version emacs-dash))) @@ -365,7 +373,8 @@ operations.") (parameterize ((%emacs emacs)) (emacs-generate-autoloads ,name lisp-dir) (setenv "EMACSLOADPATH" - (string-append ":" magit ":" dash ":" with-editor)) + (string-append ":" magit ":" magit-popup ":" ghub ":" + dash ":" with-editor)) (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) #t)))) (home-page "https://github.com/magit/magit-svn")