diff options
| author | Rutger Helling <rhelling@mykolab.com> | 2018-06-11 09:59:04 +0200 |
|---|---|---|
| committer | Rutger Helling <rhelling@mykolab.com> | 2018-06-11 18:22:10 +0200 |
| commit | ba10e0b8e1726d8be18ffcebd11572750f8bb7e8 (patch) | |
| tree | 37c4408ecf9ea24ca898cad3208ed8e53f9d790d /gnu | |
| parent | c7c86de6698ce595c26babd08fe0a0a5b18cfea4 (diff) | |
| download | guix-ba10e0b8e1726d8be18ffcebd11572750f8bb7e8.tar.gz guix-ba10e0b8e1726d8be18ffcebd11572750f8bb7e8.zip | |
gnu: spirv-tools: Update to fe2fbee.
* gnu/packages/vulkan.scm (spirv-tools): Update to fe2fbee.
[arguments]: Disable tests. Remove "-DCMAKE_INSTALL_LIBDIR" configure-flag.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/vulkan.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 293a3abbdd..163213dc2c 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -80,8 +80,8 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools ;; Keep updated in accordance with ;; https://github.com/google/shaderc/blob/known-good/known_good.json - (let ((commit "90862fe4b1c6763b32ce683d2d32c2f281f577cf") - (revision "1")) + (let ((commit "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c") + (revision "2")) (package (name "spirv-tools") (version (string-append "0.0-" revision "." (string-take commit 9))) @@ -93,14 +93,12 @@ and for the GLSL.std.450 extended instruction set. (commit commit))) (sha256 (base32 - "1yq8ab6f52wcxm2azzmx70nqz8l35izd45830aikjkk1jfzmzabb")) + "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x")) (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") - "/lib") - (string-append "-DSPIRV-Headers_SOURCE_DIR=" + `(#:tests? #f ; FIXME: Tests fail. + #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) |