[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/63: gnu: qtwebengine: Fix build failure.
From: |
guix-commits |
Subject: |
62/63: gnu: qtwebengine: Fix build failure. |
Date: |
Mon, 25 May 2020 15:15:31 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 3eb7acc1d7941b8fd28d95e830df7c2ca0d79976
Author: Marius Bakke <address@hidden>
AuthorDate: Sat May 23 15:42:07 2020 +0200
gnu: qtwebengine: Fix build failure.
* 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).
---
gnu/packages/qt.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0c3a680..d22c84f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1595,6 +1595,7 @@ message.")))
"third_party/crc32c"
"third_party/dav1d"
"third_party/dawn"
+ "third_party/emoji-segmenter"
"third_party/ffmpeg"
"third_party/googletest"
"third_party/hunspell"
@@ -1621,6 +1622,7 @@ message.")))
"third_party/libyuv"
"third_party/lss"
"third_party/markupsafe"
+ "third_party/mesa_headers"
"third_party/metrics_proto"
"third_party/modp_b64"
"third_party/nasm"
@@ -1737,6 +1739,12 @@ message.")))
(substitute*
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
(("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
;; no one notices.
@@ -1777,8 +1785,6 @@ message.")))
("libgcrypt" ,libgcrypt)
("libjpeg" ,libjpeg-turbo)
("libvpx" ,libvpx)
- ;; FIXME: configure does not find system lcms
- ;; ("lcms" ,lcms)
("libwebp" ,libwebp)
("libx11" ,libx11)
("libxcb" ,libxcb)
- 39/63: gnu: spirv-headers: Update to 1.5.3., (continued)
- 39/63: gnu: spirv-headers: Update to 1.5.3., guix-commits, 2020/05/25
- 44/63: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/25
- 51/63: gnu: Mesa: Remove unused input., guix-commits, 2020/05/25
- 49/63: gnu: shaderc: Enable (some) tests., guix-commits, 2020/05/25
- 50/63: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/25
- 29/63: gnu: pcre2: Update to 10.35., guix-commits, 2020/05/25
- 53/63: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/25
- 61/63: gnu: mesa-headers: Do not inherit outputs from Mesa., guix-commits, 2020/05/25
- 54/63: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/25
- 56/63: gnu: libdrm: Update to 2.4.101., guix-commits, 2020/05/25
- 62/63: gnu: qtwebengine: Fix build failure.,
guix-commits <=
- 43/63: gnu: glslang: Build shared libraries., guix-commits, 2020/05/25
- 47/63: gnu: vulkan-tools: Update to 1.2.140., guix-commits, 2020/05/25
- 55/63: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/25