summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2021-09-07 09:42:45 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2021-09-07 09:42:45 +0200
commitd905c347663deb896e4825cc3f3a65cd900d53aa (patch)
treeed7705ff6db30845967331f3d77d55e9e939e076
parent4610f44efdebdd968b28c8a9e0e21058677ab4ab (diff)
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.
-rw-r--r--gnu/packages/emacs-xyz.scm14
1 files 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 @@ the standard @code{Dockerfile} file format.")
(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)