[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: gnu: clisp: Use system ASDF instead of bundled one.
From: |
guix-commits |
Subject: |
03/07: gnu: clisp: Use system ASDF instead of bundled one. |
Date: |
Sat, 5 Dec 2020 10:04:49 -0500 (EST) |
glv pushed a commit to branch master
in repository guix.
commit c32a7b348556532756615fc92bccf43bd0373c03
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Fri Dec 4 10:48:41 2020 +0100
gnu: clisp: Use system ASDF instead of bundled one.
* gnu/packages/lisp.scm (clisp)[native-inputs]: Add cl-asdf.
[arguments]: Add 'replace-asdf' phase.
[native-search-paths]: Add XDG_CONFIG_DIRS and XDG_DATA_DIRS.
---
gnu/packages/lisp.scm | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index a4cbc28..2ec4da8 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -322,6 +322,8 @@ supporting ASDF, Sockets, Gray streams, MOP, and other
useful components.")
(sha256
(base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("cl-asdf" ,cl-asdf)))
(inputs `(("libffcall" ,libffcall)
("ncurses" ,ncurses)
("readline" ,readline)
@@ -356,7 +358,24 @@ supporting ASDF, Sockets, Gray streams, MOP, and other
useful components.")
(("/bin/sh") "sh"))
(substitute* '("src/clisp-link.in")
(("/bin/pwd") "pwd"))
- #t)))))
+ #t))
+ (add-after 'unpack 'replace-asdf
+ ;; Use system ASDF instead of bundled one.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
+ (guix-asdf (string-append
+ cl-asdf
+ "/share/common-lisp/source/asdf/asdf.lisp"))
+ (contrib-asdf "modules/asdf/asdf.lisp"))
+ (delete-file contrib-asdf)
+ (copy-file guix-asdf contrib-asdf)))))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))
+ (search-path-specification
+ (variable "XDG_CONFIG_DIRS")
+ (files '("etc")))))
(home-page "https://clisp.sourceforge.io/")
(synopsis "A Common Lisp implementation")
(description
- branch master updated (1ab631d -> cebfb29), guix-commits, 2020/12/05
- 02/07: gnu: ccl: Use system ASDF instead of bundled one., guix-commits, 2020/12/05
- 01/07: gnu: cl-asdf: Improve priorities of configuration file search., guix-commits, 2020/12/05
- 04/07: gnu: ecl: Simplify 'replace-asdf' phase., guix-commits, 2020/12/05
- 05/07: gnu: sbcl: Simplify 'replace-asdf' phase., guix-commits, 2020/12/05
- 03/07: gnu: clisp: Use system ASDF instead of bundled one.,
guix-commits <=
- 06/07: gnu: Add cl-log., guix-commits, 2020/12/05
- 07/07: gnu: Add zs3., guix-commits, 2020/12/05