gnu: shaderc: Update to be8e087.

* gnu/packages/vulkan.scm (shaderc): Update to be8e087.
[arguments]: Enable tests.
[inputs]: Add googletest.
master
Rutger Helling 2018-06-11 10:08:50 +02:00
parent fcfef82592
commit 7f54065487
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 7 additions and 6 deletions

View File

@ -27,6 +27,7 @@
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
@ -211,8 +212,8 @@ and the ICD.")
(deprecated-package "vulkan-icd-loader" vulkan-loader)) (deprecated-package "vulkan-icd-loader" vulkan-loader))
(define-public shaderc (define-public shaderc
(let ((commit "773ec22d49f40b7161820f29d953be4a7e40190d") (let ((commit "be8e0879750303a1de09385465d6b20ecb8b380d")
(revision "1")) (revision "2"))
(package (package
(name "shaderc") (name "shaderc")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -225,11 +226,10 @@ and the ICD.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:tests? #f ; tests don't work yet. `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -267,7 +267,8 @@ and the ICD.")
(copy-recursively glslang-source "third_party/glslang") (copy-recursively glslang-source "third_party/glslang")
#t)))))) #t))))))
(inputs (inputs
`(("python" ,python))) `(("googletest" ,googletest)
("python" ,python)))
(native-inputs (native-inputs
`(("cmake" ,cmake) `(("cmake" ,cmake)
("glslang-source" ,(package-source glslang)) ("glslang-source" ,(package-source glslang))