diff options
| author | Mark H Weaver <mhw@netris.org> | 2021-11-03 02:41:23 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2021-11-03 05:47:17 -0400 |
| commit | 9d3a5ddc2700aa099bb1bf9c5e8b3062445b907a (patch) | |
| tree | 04c100de529a629d90a0e1968e5b316a21ec90b1 | |
| parent | af5742c05b1ea1aac8fb0707e265964006cd197a (diff) | |
gnu: webkitgtk: Fix the build.
This is a followup to commit 8797a07ac0c2f2cce93b6642942a2654eaec1c69.
* gnu/packages/webkit.scm (webkitgtk)[arguments]: Add "-DUSE_SOUP2=ON"
to the configure flags. Add the 'prepare-build-environment' phase,
which arranges to use clang for compilation.
[native-inputs]: Add clang-11.
[inputs]: Add lcms.
| -rw-r--r-- | gnu/packages/webkit.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0e6cdb8588..e54b680855 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015–2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> @@ -40,6 +40,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -51,6 +52,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -252,6 +254,9 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib") + ;; XXX TODO: Use libsoup@3. + "-DUSE_SOUP2=ON" + ;; XXX Adding GStreamer GL support would apparently ;; require adding gst-plugins-bad to the inputs, ;; which might entail a security risk as a result of @@ -290,6 +295,11 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) (string-append wpebackend-fdo "/lib/" all))) #t))) + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" "clang") + (setenv "CXX" "clang++") + #t)) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -299,7 +309,8 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (string-append doc "/share/gtk-doc")) #t)))))) (native-inputs - `(("bison" ,bison) + `(("clang" ,clang-11) + ("bison" ,bison) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) @@ -323,6 +334,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ("harfbuzz" ,harfbuzz) ("hyphen" ,hyphen) ("icu4c" ,icu4c) + ("lcms" ,lcms) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg-turbo) ("libnotify" ,libnotify) |