diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-13 17:21:32 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-13 17:21:32 +0200 |
commit | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (patch) | |
tree | 8377d7c70a925f7c5ea4c04473c4eb547610b64b /gnu/packages/webkit.scm | |
parent | a3ac317ab4a90f66ac65055fa26dee58ed2367b8 (diff) | |
parent | dd4c1992103a65b8fbdc80fe07a9fe9be822769a (diff) | |
download | guix-emacs-team.tar.gz |
Merge branch 'master' into emacs-team emacs-team
Diffstat (limited to 'gnu/packages/webkit.scm')
-rw-r--r-- | gnu/packages/webkit.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f1b810adbd..f47fff25d2 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -199,6 +199,13 @@ engine that uses Wayland for graphics output.") (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" (("libWPEBackend-fdo-[\\.0-9]+\\.so" all) (search-input-file inputs (string-append "lib/" all))))))) + #$@(if (target-x86-32?) + ;; Don't include x86intrin.h on i686-linux. + '((add-after 'unpack 'fix-headers + (lambda _ + (substitute* "Source/ThirdParty/ANGLE/src/common/platform.h" + (("\\|\\| defined\\(__i386__\\)") ""))))) + '()) #$@(if (target-x86-64?) '() '((add-after 'unpack 'disable-sse2 @@ -222,7 +229,7 @@ engine that uses Wayland for graphics output.") pkg-config python-wrapper gi-docgen - ruby + ruby-2.7 unifdef)) (propagated-inputs (list gtk+ libsoup)) |