From d905c347663deb896e4825cc3f3a65cd900d53aa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 7 Sep 2021 09:42:45 +0200 Subject: [PATCH] gnu: emacs-lsp-mode: Move all client libraries at top-level. * gnu/packages/emacs-xyz.scm (emacs-lsp-mode)[arguments]<#:phases>: Move all client libraries at top-level. <#:emacs>: Use full Emacs for libxml support. --- gnu/packages/emacs-xyz.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index daa9cbf635..541aaa9372 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23557,10 +23557,16 @@ (define-public emacs-lsp-mode (base32 "1a6jc9sxf9b8fj9h8xlv5k546bkzsy8j5nj19cfama389z0bzcsl")))) (build-system emacs-build-system) (arguments - `(#:include (cons "^clients/" %default-include) - ;; FIXME: Ignore the following file, which cannot be compiled properly, - ;; because it tries to load another client from the same directory. - #:exclude (list "clients/lsp-vetur\\.el"))) + `(#:emacs ,emacs ;need libxml support + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'move-clients-libraries + ;; Move all clients libraries at top-level, as is done, e.g., in + ;; MELPA. + (lambda _ + (for-each (lambda (f) + (install-file f ".")) + (find-files "clients/" "\\.el$"))))))) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f)