aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/lisp-xyz.scm82
1 files changed, 48 insertions, 34 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 451f801db5..0292937d92 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -3455,43 +3455,57 @@ is a library for creating graphical user interfaces.")
(sbcl-package->ecl-package sbcl-cl-cffi-gtk))
(define-public sbcl-cl-webkit
- (let ((commit "cfc4f01ee806169d824750b4014653a93af9353d"))
- (package
- (name "sbcl-cl-webkit")
- (version (git-version "2.4" "16" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/joachifm/cl-webkit")
- (commit commit)))
- (file-name (git-file-name "cl-webkit" version))
- (sha256
- (base32
- "18n90m33bi6arnjmwr3q3m0arwzr0kdnydlv4if82crvaagd6m89"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("cffi" ,sbcl-cffi)
- ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
- ("webkitgtk" ,webkitgtk)))
- (arguments
- `(#:asd-systems '("cl-webkit2")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "webkit2/webkit2.init.lisp"
- (("libwebkit2gtk" all)
- (string-append
- (assoc-ref inputs "webkitgtk") "/lib/" all))))))))
- (home-page "https://github.com/joachifm/cl-webkit")
- (synopsis "Binding to WebKitGTK+ for Common Lisp")
- (description
- "@command{cl-webkit} is a binding to WebKitGTK+ for Common Lisp,
+ (package
+ (name "sbcl-cl-webkit")
+ (version "3.0.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/joachifm/cl-webkit")
+ (commit version)))
+ (file-name (git-file-name "cl-webkit" version))
+ (sha256
+ (base32
+ "015xry1cvbgspfzz35ifz2qscz946ljhj2z8rzjscy9v8fgnjsdk"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cffi" ,sbcl-cffi)
+ ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
+ ("webkitgtk" ,webkitgtk)))
+ (native-inputs
+ `(;; Tests seem to need Xorg.
+ ;; ("xorg-server" ,xorg-server-for-tests)
+ ("calispel" ,sbcl-calispel)
+ ("fiveam" ,sbcl-fiveam)
+ ("float-features" ,sbcl-float-features)))
+ (arguments
+ `(#:asd-systems '("cl-webkit2")
+ #:tests? #f ; TODO: Tests hang, why?
+ #:phases
+ (modify-phases %standard-phases
+ ;; The following phase is needed for tests:
+ ;; (add-before 'check 'start-xorg-server
+ ;; (lambda* (#:key inputs #:allow-other-keys)
+ ;; ;; The test suite requires a running X server.
+ ;; (system (string-append (assoc-ref inputs "xorg-server")
+ ;; "/bin/Xvfb :1 &"))
+ ;; (setenv "DISPLAY" ":1")
+ ;; #t))
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "webkit2/webkit2.init.lisp"
+ (("libwebkit2gtk" all)
+ (string-append
+ (assoc-ref inputs "webkitgtk") "/lib/" all))))))))
+ (home-page "https://github.com/joachifm/cl-webkit")
+ (synopsis "Binding to WebKitGTK+ for Common Lisp")
+ (description
+ "@command{cl-webkit} is a binding to WebKitGTK+ for Common Lisp,
currently targeting WebKit version 2. The WebKitGTK+ library adds web
browsing capabilities to an application, leveraging the full power of the
WebKit browsing engine.")
- (license license:expat))))
+ (license license:expat)))
(define-public cl-webkit
(sbcl-package->cl-source-package sbcl-cl-webkit))