me/guix
Archived
1
0
Fork 0
Code Activity

gnu: emacs-sly-stepper: Find required Common Lisp dependency.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-sly-stepper)[inputs]: Add
cl-agnostic-lizard.
[arguments]: Patch Lisp file to find agnostic-lizard's absolute path.
This commit is contained in:
Pierre Neidhardt 2021-01-06 10:45:52 +01:00
parent caa22090e1
commit 0c8abacf3a
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/emacs-xyz.scm
View file

@ -34,7 +34,7 @@
;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018, 2019 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2018, 2019 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
@ -152,6 +152,7 @@
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages music) #:use-module (gnu packages music)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
@ -9750,6 +9751,8 @@ inside the source file.")
(base32 (base32
"09ll9dv8fd5dgnki82hcd48nm4qdzzn8wpva0zzr69zkjwzf9v25")))) "09ll9dv8fd5dgnki82hcd48nm4qdzzn8wpva0zzr69zkjwzf9v25"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(inputs
`(("cl-agnostic-lizard" ,cl-agnostic-lizard)))
(propagated-inputs (propagated-inputs
`(("emacs-sly" ,emacs-sly))) `(("emacs-sly" ,emacs-sly)))
(arguments (arguments
@ -9765,7 +9768,29 @@ inside the source file.")
(setenv "EMACSLOADPATH" (setenv "EMACSLOADPATH"
(string-append sly "/share/emacs/site-lisp/contrib:" (string-append sly "/share/emacs/site-lisp/contrib:"
(getenv "EMACSLOADPATH")))) (getenv "EMACSLOADPATH"))))
#t))))) #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/"
"slynk-stepper.lisp"))
(asd (string-append
(assoc-ref inputs "cl-agnostic-lizard")
"/share/common-lisp/systems/agnostic-lizard.asd")))
;; agnostic-lizard is found at runtime.
(substitute* file
(("\\(funcall \\(read-from-string \"asdf:load-system\"\\)")
(string-append
"(funcall (read-from-string \"asdf:load-asd\") \""
asd
"\")\n (funcall (read-from-string \"asdf:load-system\")"))
;; Upstream mistakenly requires Quicklisp. See
;; https://github.com/joaotavora/sly-stepper/issues/2.
(("\\(funcall \\(read-from-string \"ql:quickload\"\\)")
(string-append
"(ignore-errors (funcall (read-from-string \"ql:quickload\") "
":agnostic-lizard))"))
((" :agnostic-lizard\\)") ""))))))))
(synopsis "Portable Common Lisp stepper interface for Emacs") (synopsis "Portable Common Lisp stepper interface for Emacs")
(description (description
"This package features a new, portable, visual stepping facility for "This package features a new, portable, visual stepping facility for