[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system.
From: |
guix-commits |
Subject: |
02/04: gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system. |
Date: |
Sun, 4 Apr 2021 08:33:46 -0400 (EDT) |
leoprikler pushed a commit to branch wip-emacs
in repository guix.
commit cb500467d2091f37b54e2be4072223dc40e3d56d
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Sun Apr 4 14:16:44 2021 +0200
gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system.
* gnu/packages/emacs-xyz.scm (emacs-sly-stepper)[#:phases]:
<add-contrib-to-emacs-load-path>: Rename to...
<expand-sly-contrib>: ... this. Use find-files to find contrib directory.
<install>: Find slynk-stepper.lisp in subdirectory.
---
gnu/packages/emacs-xyz.scm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 789e32b..fe62380 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10330,23 +10330,26 @@ inside the source file.")
(propagated-inputs
`(("emacs-sly" ,emacs-sly)))
(arguments
- '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
+ `(#:include (cons* "\\.lisp$" "\\.asd$" %default-include)
#:phases
(modify-phases %standard-phases
;; The package provides autoloads.
(delete 'make-autoloads)
(delete 'enable-autoloads-compilation)
- (add-after 'add-source-to-load-path 'add-contrib-to-emacs-load-path
+ (add-after 'expand-load-path 'expand-sly-contrib
(lambda* (#:key inputs #:allow-other-keys)
- (let ((sly (assoc-ref inputs "emacs-sly")))
+ (let* ((sly (assoc-ref inputs "emacs-sly"))
+ (contrib (find-files sly "^contrib$" #:directories? #t)))
(setenv "EMACSLOADPATH"
- (string-append sly "/share/emacs/site-lisp/contrib:"
- (getenv "EMACSLOADPATH"))))
- #t))
+ (string-append (string-join contrib ":")
+ ":"
+ (getenv "EMACSLOADPATH")))
+ #t)))
(add-after 'install 'find-agnostic-lizard
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(file (string-append out "/share/emacs/site-lisp/"
+ "sly-stepper-" ,version "/"
"slynk-stepper.lisp"))
(asd (string-append
(assoc-ref inputs "cl-agnostic-lizard")