me/guix
Archived
1
0
Fork 0
Code Activity

gnu: qtwebengine: Fix build failure.

Browse source 
* gnu/packages/qt.scm (qtwebengine)[source](snippet): Preserve the included
Mesa headers, to avoid an incompatibility with system Mesa.  Also adjust some
files to use system Vulkan headers.  Preserve third_party/emoji-segmenter.
[inputs]: Remove obsolete comment (LCMS is already in inputs).
This commit is contained in:
Marius Bakke 2020-05-23 15:42:07 +02:00 • committed by Marius Bakke
parent cb475eaa71
commit c37b621cf3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/qt.scm
View file

@ -1595,6 +1595,7 @@ message.")))
"third_party/crc32c" "third_party/crc32c"
"third_party/dav1d" "third_party/dav1d"
"third_party/dawn" "third_party/dawn"
"third_party/emoji-segmenter"
"third_party/ffmpeg" "third_party/ffmpeg"
"third_party/googletest" "third_party/googletest"
"third_party/hunspell" "third_party/hunspell"
@ -1621,6 +1622,7 @@ message.")))
"third_party/libyuv" "third_party/libyuv"
"third_party/lss" "third_party/lss"
"third_party/markupsafe" "third_party/markupsafe"
"third_party/mesa_headers"
"third_party/metrics_proto" "third_party/metrics_proto"
"third_party/modp_b64" "third_party/modp_b64"
"third_party/nasm" "third_party/nasm"
@ -1737,6 +1739,12 @@ message.")))
(substitute* (substitute*
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
(("third_party/curl") "curl")) (("third_party/curl") "curl"))
(substitute*
'("components/viz/common/gpu/vulkan_context_provider.h"
"components/viz/common/resources/resource_format_utils.h"
"gpu/config/gpu_util.cc")
(("third_party/vulkan/include/")
""))
;; Replace Google Analytics bundle with an empty file and hope ;; Replace Google Analytics bundle with an empty file and hope
;; no one notices. ;; no one notices.
@ -1777,8 +1785,6 @@ message.")))
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libvpx" ,libvpx) ("libvpx" ,libvpx)
;; FIXME: configure does not find system lcms
;; ("lcms" ,lcms)
("libwebp" ,libwebp) ("libwebp" ,libwebp)
("libx11" ,libx11) ("libx11" ,libx11)
("libxcb" ,libxcb) ("libxcb" ,libxcb)