aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/qt.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-10-21 09:05:13 +0300
committerEfraim Flashner <efraim@flashner.co.il>2018-10-28 09:51:56 +0200
commit124351efadf9c0ad5a4dd2d48ca604ed19092ffc (patch)
tree582d3db5d864d15b3dceac9074412182ac832a57 /gnu/packages/qt.scm
parentd28af1991ae0a99e660ad1b82ac955556d3a9382 (diff)
downloadguix-124351efadf9c0ad5a4dd2d48ca604ed19092ffc.tar
guix-124351efadf9c0ad5a4dd2d48ca604ed19092ffc.tar.gz
gnu: qt: Add vulkan support.
* gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers. (qt@4)[native-inputs]: Don't add vulkan-headers. (qttools)[native-inputs]: Add vulkan-headers.
Diffstat (limited to 'gnu/packages/qt.scm')
-rw-r--r--gnu/packages/qt.scm23
1 files changed, 17 insertions, 6 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index dffa8b5cf0..ae926ed3d0 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)))