nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Efraim Flashner 2018-10-21 09:05:13 +03:00
parent d28af1991a
commit 124351efad
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/qt.scm
View File

@ -64,9 +64,11 @@
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages vulkan)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml)
#:use-module (srfi srfi-1))
(define-public grantlee (define-public grantlee
(package (package
@ -224,6 +226,7 @@ system, and the core design of Django is reused in Grantlee.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python-2)
("ruby" ,ruby) ("ruby" ,ruby)
("vulkan-headers" ,vulkan-headers)
("which" ,(@ (gnu packages base) which)))) ("which" ,(@ (gnu packages base) which))))
(arguments (arguments
`(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra. `(#: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. ;; Remove webkit module, which is not built.
'(begin (delete-file-recursively "src/3rdparty/webkit") '(begin (delete-file-recursively "src/3rdparty/webkit")
#t)))) #t))))
(inputs `(,@(alist-delete "harfbuzz" (inputs
(alist-delete "libjpeg" (package-inputs qt))) `(,@(fold alist-delete
("libjepg" ,libjpeg-8) (package-inputs qt)
("libsm" ,libsm))) '("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, ;; 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" ;; 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) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-2) ("python" ,python-2)
("vulkan-headers" ,vulkan-headers)
("ruby" ,ruby))) ("ruby" ,ruby)))
(arguments (arguments
`(#:phases `(#:phases
@ -1283,7 +1293,8 @@ positioning and geolocation plugins.")))
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)
("vulkan-headers" ,vulkan-headers)))
(inputs (inputs
`(("mesa" ,mesa) `(("mesa" ,mesa)
("qtbase" ,qtbase))) ("qtbase" ,qtbase)))