guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: next: Fix build with SBCL 2.0.2.


From: guix-commits
Subject: branch master updated: gnu: next: Fix build with SBCL 2.0.2.
Date: Sat, 07 Mar 2020 11:12:41 -0500

This is an automated email from the git hooks/post-receive script.

ambrevar pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 262d6ed  gnu: next: Fix build with SBCL 2.0.2.
262d6ed is described below

commit 262d6ed4652f7274af8f0ec0a8d32f9e895c417f
Author: Pierre Neidhardt <address@hidden>
AuthorDate: Sat Mar 7 17:11:49 2020 +0100

    gnu: next: Fix build with SBCL 2.0.2.
    
    * gnu/packages/web-browsers.scm (next)[arguments]: Fix lambda-list type 
error
      on SBCL 2.0.2.
---
 gnu/packages/web-browsers.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index c68c911..8a6ffae 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -575,7 +575,17 @@ key-bindings and is fully configurable and extensible in 
Common Lisp.")
                             (format #t "~a" ,(package-version 
next-gtk-webkit))))
                         (invoke "make" "install-assets"
                                 (string-append "PREFIX="
-                                               (assoc-ref outputs "out"))))))))
+                                               (assoc-ref outputs "out")))))
+                    (add-after 'unpack 'fix-lambda-list
+                      ;; Starting from SBCL 2.0.2, Next 1.5.0 won't build
+                      ;; because of a weird lambda list type.
+                      (lambda _
+                        (substitute* "source/keymap.lisp"
+                          (("^\\(declaim .* define-key\\)\\)") ""))
+                        (substitute* "source/search-buffer.lisp"
+                          (("define-key :keymap keymap \"C-s\"") "define-key 
\"C-s\"")
+                          (("\\(update-selection-highlight-hint :follow t 
:scroll t\\)\\)\\)")
+                           "(update-selection-highlight-hint :follow t :scroll 
t)) :keymap keymap)")))))))
       (inputs
        `(("alexandria" ,sbcl-alexandria)
          ("bordeaux-threads" ,sbcl-bordeaux-threads)



reply via email to

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