guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/06: gnu: cl-fof: Fix build with recent cl-serapeum.


From: guix-commits
Subject: 04/06: gnu: cl-fof: Fix build with recent cl-serapeum.
Date: Tue, 14 Jun 2022 09:59:04 -0400 (EDT)

glv pushed a commit to branch master
in repository guix.

commit 0fd660a2b29e3bd6102740504892830010472885
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Tue Jun 14 15:38:21 2022 +0200

    gnu: cl-fof: Fix build with recent cl-serapeum.
    
    * gnu/packages/lisp-xyz.scm (sbcl-fof)[inputs]: Remove labels and add
      sbcl-named-readtables.
      [arguments]: Add 'fix-build' phase.
---
 gnu/packages/lisp-xyz.scm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 8ebb66b212..44790bc98b 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -15404,20 +15404,25 @@ return the CPU count of the current system.")
              (substitute* "ffprobe.lisp"
                (("\\(defvar \\*ffprobe-command\\* \"ffprobe\"\\)")
                 (format #f "(defvar *ffprobe-command* \"~a/bin/ffprobe\")"
-                        (assoc-ref inputs "ffmpeg") )))
-             #t)))))
+                        (assoc-ref inputs "ffmpeg"))))))
+         (add-after 'unpack 'fix-build
+           (lambda _
+             (substitute* "file.lisp"
+               (("\\(:import-from #:magicffi\\)" all)
+                (string-append all  "(:import-from #:named-readtables)"))))))))
     (inputs
-     `(("alexandria" ,sbcl-alexandria)
-       ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star)
-       ("local-time" ,sbcl-local-time)
-       ("magicffi" ,sbcl-magicffi)
-       ("osicat" ,sbcl-osicat)
-       ("serapeum" ,sbcl-serapeum)
-       ("str" ,sbcl-cl-str)
-       ("trivia" ,sbcl-trivia)
-       ("trivial-package-local-nicknames" 
,sbcl-trivial-package-local-nicknames)
-       ;; Non-CL deps:
-       ("ffmpeg" ,ffmpeg)))
+     (list sbcl-alexandria
+           sbcl-hu.dwim.defclass-star
+           sbcl-local-time
+           sbcl-magicffi
+           sbcl-named-readtables
+           sbcl-osicat
+           sbcl-serapeum
+           sbcl-cl-str
+           sbcl-trivia
+           sbcl-trivial-package-local-nicknames
+           ;; Non-CL deps:
+           ffmpeg))
     (home-page "https://gitlab.com/ambrevar/fof";)
     (synopsis "File object finder library for Common Lisp")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]