summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Le Vaillant <glv@posteo.net>2022-06-14 15:38:21 +0200
committerGuillaume Le Vaillant <glv@posteo.net>2022-06-14 15:38:21 +0200
commit0fd660a2b29e3bd6102740504892830010472885 (patch)
treefd77e9e29d719c87fa3f6a9f9f7a09ea5d533509
parent50b6377bc4ef9722286f42735129fb5473486dfb (diff)
downloadguix-0fd660a2b29e3bd6102740504892830010472885.tar.gz
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.
-rw-r--r--gnu/packages/lisp-xyz.scm31
1 files 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