[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/22: gnu: sbcl-cl-gamepad: Remove asdf:compile-system workaround.
From: |
guix-commits |
Subject: |
03/22: gnu: sbcl-cl-gamepad: Remove asdf:compile-system workaround. |
Date: |
Wed, 3 Aug 2022 10:48:00 -0400 (EDT) |
glv pushed a commit to branch master
in repository guix.
commit 4b7cca1b45824f425908831c272496f5e040ba33
Author: Pierre Neidhardt <mail@ambrevar.xyz>
AuthorDate: Fri Jul 1 18:20:18 2022 +0200
gnu: sbcl-cl-gamepad: Remove asdf:compile-system workaround.
* gnu/packages/lisp-xyz.scm (sbcl-cl-gamepad)[arguments]: Remove 'build
phase
patch now that asdf-build-system/sbcl builds using asdf:load-system which
fixes the bug.
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
gnu/packages/lisp-xyz.scm | 32 ++------------------------------
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c57796a419..c34dfdf5a6 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2018, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2018, 2020, 2021, 2022 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
@@ -18072,35 +18072,7 @@ tested (as shown in the examples).")
(substitute* "evdev-cffi.lisp"
(("libevdev.so" all)
(string-append (assoc-ref inputs "libevdev")
- "/lib/" all)))))
- ;; Here we use a custom build phase to work around a compilation
bug.
- ;; Using 'asdf:compile-system' fails, but using 'asdf:load-system'
- ;; succeeds (and also compiles the system).
- ;; See https://github.com/Shirakumo/cl-gamepad/issues/8
- (replace 'build
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (source-path (string-append out
- "/share/common-lisp/"
- (%lisp-type)))
- (translations `((,source-path
- :**/ :*.*.*)
- (,(string-append out
- "/lib/common-lisp/"
- (%lisp-type))
- :**/ :*.*.*))))
- (setenv "ASDF_OUTPUT_TRANSLATIONS"
- (format #f "~S" `(:output-translations
- ,translations
- :inherit-configuration)))
- (setenv "HOME" (assoc-ref outputs "out"))
- (with-directory-excursion (string-append source-path
- "/cl-gamepad")
- (invoke (%lisp-type)
- "--eval" "(require :asdf)"
- "--eval" "(asdf:load-asd (truename
\"cl-gamepad.asd\"))"
- "--eval" "(asdf:load-system :cl-gamepad)"
- "--eval" "(quit)"))))))))
+ "/lib/" all))))))))
(inputs
`(("cffi" ,sbcl-cffi)
("documentation-utils" ,sbcl-documentation-utils)
- branch master updated (c4e58c119d -> 18f1befba3), guix-commits, 2022/08/03
- 04/22: gnu: Remove obsolete references to asd-files and test-asd-file., guix-commits, 2022/08/03
- 14/22: gnu: sbcl-hdf5-cffi: Enable tests., guix-commits, 2022/08/03
- 03/22: gnu: sbcl-cl-gamepad: Remove asdf:compile-system workaround.,
guix-commits <=
- 05/22: gnu: sbcl-quri: Remove obsolete test workaround., guix-commits, 2022/08/03
- 08/22: gnu: sbcl-jonathan: Fix tests., guix-commits, 2022/08/03
- 13/22: gnu: sbcl-vas-string-metrics: Re-enable tests., guix-commits, 2022/08/03
- 12/22: gnu: sbcl-cl-heap: Re-enable tests., guix-commits, 2022/08/03
- 15/22: gnu: Add cl-mw-equiv., guix-commits, 2022/08/03
- 16/22: gnu: sbcl-quantile-estimator: Enable tests., guix-commits, 2022/08/03
- 02/22: build-system: asdf: Let ASDF locate the .asd files., guix-commits, 2022/08/03
- 10/22: gnu: sbcl-spatial-trees: Build spatial-trees.nss and fix tests., guix-commits, 2022/08/03
- 06/22: gnu: sbcl-cl-reexport: Remove obsolete test workaround., guix-commits, 2022/08/03
- 11/22: gnu: sbcl-lisp-namespace: Enable tests., guix-commits, 2022/08/03