From 22de0cac8481df8b9645e08420f54bb2beabe1ed Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 1 Jul 2022 18:20:18 +0200 Subject: [PATCH 03/18] 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. --- gnu/packages/lisp-xyz.scm | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3d6ce68fb8..3b13d1739e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17878,35 +17878,7 @@ (define-public sbcl-cl-gamepad (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) -- 2.32.0