gnu: next: Fix build with SBCL 2.0.2.
authorPierre Neidhardt <mail@ambrevar.xyz>
Sat, 7 Mar 2020 16:11:49 +0000 (17:11 +0100)
committerPierre Neidhardt <mail@ambrevar.xyz>
Sat, 7 Mar 2020 16:12:35 +0000 (17:12 +0100)
* gnu/packages/web-browsers.scm (next)[arguments]: Fix lambda-list type error
  on SBCL 2.0.2.

gnu/packages/web-browsers.scm

index c68c911..8a6ffae 100644 (file)
@@ -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)