Merge branch 'staging'

1 files changed, 36 insertions, 40 deletions

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index bf1d45e5cc..7fe890502e 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -654,47 +654,43 @@ driven and does not detract you from your daily work.")
      `(("prove" ,sbcl-prove)
        ("sbcl" ,sbcl)))
     (inputs
-     ;; We need to avoid sbcl-* inputs (sbcl-cl-cffi-gtk in particular) as they
-     ;; seem to cause Nyxt to hang into a hogging process in about 10 minutes.
-     ;; Probably an issue between CFFI and how we build SBCL packages.
-     ;; See https://github.com/atlas-engineer/nyxt/issues/680.
-     `(("alexandria" ,cl-alexandria)
-       ("bordeaux-threads" ,cl-bordeaux-threads)
-       ("cl-chanl" ,cl-chanl)
-       ("cl-containers" ,cl-containers)
-       ("cl-css" ,cl-css)
-       ("cl-json" ,cl-json)
-       ("cl-markup" ,cl-markup)
-       ("cl-ppcre" ,cl-ppcre)
-       ("cl-prevalence" ,cl-prevalence)
-       ("closer-mop" ,cl-closer-mop)
-       ("cluffer" ,cl-cluffer)
-       ("dexador" ,cl-dexador)
-       ("enchant" ,cl-enchant)
-       ("fset" ,cl-fset)
-       ("hu.dwim.defclass-star" ,cl-hu.dwim.defclass-star)
-       ("iolib" ,cl-iolib)
-       ("local-time" ,cl-local-time)
-       ("log4cl" ,cl-log4cl)
-       ("mk-string-metrics" ,cl-mk-string-metrics)
-       ("moptilities" ,cl-moptilities)
-       ("osicat" ,sbcl-osicat)         ; SBCL version needed for libosicat.so.
-       ("parenscript" ,cl-parenscript)
-       ("plump" ,cl-plump)
-       ("quri" ,cl-quri)
-       ("serapeum" ,cl-serapeum)
-       ("str" ,cl-str)
-       ("swank" ,cl-slime-swank)
-       ("trivia" ,cl-trivia)
-       ("trivial-clipboard" ,cl-trivial-clipboard)
-       ("trivial-features" ,cl-trivial-features)
-       ("trivial-package-local-nicknames" ,cl-trivial-package-local-nicknames)
-       ("trivial-types" ,cl-trivial-types)
-       ("unix-opts" ,cl-unix-opts)
-       ("usocket" ,cl-usocket)
+     `(("alexandria" ,sbcl-alexandria)
+       ("bordeaux-threads" ,sbcl-bordeaux-threads)
+       ("cl-chanl" ,sbcl-chanl)
+       ("cl-containers" ,sbcl-cl-containers)
+       ("cl-css" ,sbcl-cl-css)
+       ("cl-json" ,sbcl-cl-json)
+       ("cl-markup" ,sbcl-cl-markup)
+       ("cl-ppcre" ,sbcl-cl-ppcre)
+       ("cl-prevalence" ,sbcl-cl-prevalence)
+       ("closer-mop" ,sbcl-closer-mop)
+       ("cluffer" ,sbcl-cluffer)
+       ("dexador" ,sbcl-dexador)
+       ("enchant" ,sbcl-enchant)
+       ("fset" ,sbcl-fset)
+       ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star)
+       ("iolib" ,sbcl-iolib)
+       ("local-time" ,sbcl-local-time)
+       ("log4cl" ,sbcl-log4cl)
+       ("mk-string-metrics" ,sbcl-mk-string-metrics)
+       ("moptilities" ,sbcl-moptilities)
+       ("osicat" ,sbcl-osicat)
+       ("parenscript" ,sbcl-parenscript)
+       ("plump" ,sbcl-plump)
+       ("quri" ,sbcl-quri)
+       ("serapeum" ,sbcl-serapeum)
+       ("str" ,sbcl-cl-str)
+       ("swank" ,sbcl-slime-swank)
+       ("trivia" ,sbcl-trivia)
+       ("trivial-clipboard" ,sbcl-trivial-clipboard)
+       ("trivial-features" ,sbcl-trivial-features)
+       ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames)
+       ("trivial-types" ,sbcl-trivial-types)
+       ("unix-opts" ,sbcl-unix-opts)
+       ("usocket" ,sbcl-usocket)
        ;; WebKitGTK deps
-       ("cl-cffi-gtk" ,cl-cffi-gtk)
-       ("cl-webkit" ,cl-webkit)
+       ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
+       ("cl-webkit" ,sbcl-cl-webkit)
        ("glib-networking" ,glib-networking)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
     (synopsis "Extensible web-browser in Common Lisp")