ambrevar pushed a commit to branch master
in repository guix.
commit 74fb7f900e046e65d99563ba439526c51039f9d4
Author: Pierre Neidhardt <[email protected]>
AuthorDate: Thu Jun 18 16:43:18 2020 +0200
gnu: cl-cxml: Remove ASD fix since our build system supports component-less
asd.
* gnu/packages/lisp-xyz.scm (cl-cxml)[arguments]: Remove 'remove-component
phase.
---
gnu/packages/lisp-xyz.scm | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 09d25f0..d2c7560 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5719,22 +5719,7 @@ offered, one SAX-like, the other similar to StAX.")
(install-file "catalog.dtd"
(string-append
(assoc-ref outputs "out")
- "/lib/" (%lisp-type)))))
- (add-after 'create-asd 'remove-component
- ;; XXX: The original .asd has no components, but our build system
- ;; creates an entry nonetheless. We need to remove it for the
- ;; generated .asd to load properly. See trivia.trivial for a
- ;; similar problem.
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (asd (string-append out "/lib/sbcl/cxml.asd")))
- (substitute* asd
- ((" :components
-")
- ""))
- (substitute* asd
- ((" *\\(\\(:compiled-file \"cxml--system\"\\)\\)")
- ""))))))))))
+ "/lib/" (%lisp-type))))))))))
(define-public cl-cxml
(sbcl-package->cl-source-package sbcl-cxml))
