[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: qt: Add vulkan support.
From: |
Efraim Flashner |
Subject: |
03/06: gnu: qt: Add vulkan support. |
Date: |
Sun, 28 Oct 2018 03:53:51 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 124351efadf9c0ad5a4dd2d48ca604ed19092ffc
Author: Efraim Flashner <address@hidden>
Date: Sun Oct 21 09:05:13 2018 +0300
gnu: qt: Add vulkan support.
* gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers.
(address@hidden)[native-inputs]: Don't add vulkan-headers.
(qttools)[native-inputs]: Add vulkan-headers.
---
gnu/packages/qt.scm | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index dffa8b5..ae926ed 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -64,9 +64,11 @@
#:use-module (gnu packages ruby)
#:use-module (gnu packages sdl)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages xml))
+ #:use-module (gnu packages xml)
+ #:use-module (srfi srfi-1))
(define-public grantlee
(package
@@ -224,6 +226,7 @@ system, and the core design of Django is reused in
Grantlee.")
("pkg-config" ,pkg-config)
("python" ,python-2)
("ruby" ,ruby)
+ ("vulkan-headers" ,vulkan-headers)
("which" ,(@ (gnu packages base) which))))
(arguments
`(#:parallel-build? #f ; Triggers race condition in qtbase module on
Hydra.
@@ -401,10 +404,16 @@ system, and the core design of Django is reused in
Grantlee.")
;; Remove webkit module, which is not built.
'(begin (delete-file-recursively "src/3rdparty/webkit")
#t))))
- (inputs `(,@(alist-delete "harfbuzz"
- (alist-delete "libjpeg" (package-inputs qt)))
- ("libjepg" ,libjpeg-8)
- ("libsm" ,libsm)))
+ (inputs
+ `(,@(fold alist-delete
+ (package-inputs qt)
+ '("harfbuzz" "libjpeg"))
+ ("libjpeg" ,libjpeg-8)
+ ("libsm" ,libsm)))
+ (native-inputs
+ `(,@(fold alist-delete
+ (package-native-inputs qt)
+ '("vulkan-headers"))))
;; Note: there are 37 MiB of examples and a '-exampledir' configure flags,
;; but we can't make them a separate output because "out" and "examples"
@@ -560,6 +569,7 @@ system, and the core design of Django is reused in
Grantlee.")
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-2)
+ ("vulkan-headers" ,vulkan-headers)
("ruby" ,ruby)))
(arguments
`(#:phases
@@ -1283,7 +1293,8 @@ positioning and geolocation plugins.")))
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
`(("perl" ,perl)
- ("qtdeclarative" ,qtdeclarative)))
+ ("qtdeclarative" ,qtdeclarative)
+ ("vulkan-headers" ,vulkan-headers)))
(inputs
`(("mesa" ,mesa)
("qtbase" ,qtbase)))
- branch master updated (2b9b4b1 -> 852a569), Efraim Flashner, 2018/10/28
- 02/06: gnu: qt: Use system sqlite., Efraim Flashner, 2018/10/28
- 05/06: gnu: address@hidden: Update build config., Efraim Flashner, 2018/10/28
- 04/06: gnu: qt: Use invoke., Efraim Flashner, 2018/10/28
- 03/06: gnu: qt: Add vulkan support.,
Efraim Flashner <=
- 06/06: gnu: address@hidden: Use invoke., Efraim Flashner, 2018/10/28
- 01/06: gnu: qt: Update to 5.11.2., Efraim Flashner, 2018/10/28