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

gnu: spirv-tools: Update to fe2fbee. 

* gnu/packages/vulkan.scm (spirv-tools): Update to fe2fbee.
[arguments]: Disable tests. Remove "-DCMAKE_INSTALL_LIBDIR" configure-flag.
This commit is contained in:
Rutger Helling 2018-06-11 09:59:04 +02:00
parent c7c86de669
commit ba10e0b8e1
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/vulkan.scm
View File

@ -80,8 +80,8 @@ and for the GLSL.std.450 extended instruction set.
(define-public spirv-tools (define-public spirv-tools
;; Keep updated in accordance with ;; Keep updated in accordance with
;; https://github.com/google/shaderc/blob/known-good/known_good.json ;; https://github.com/google/shaderc/blob/known-good/known_good.json
(let ((commit "90862fe4b1c6763b32ce683d2d32c2f281f577cf") (let ((commit "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c")
(revision "1")) (revision "2"))
(package (package
(name "spirv-tools") (name "spirv-tools")
(version (string-append "0.0-" revision "." (string-take commit 9))) (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))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1yq8ab6f52wcxm2azzmx70nqz8l35izd45830aikjkk1jfzmzabb")) "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR=" `(#:tests? #f ; FIXME: Tests fail.
(assoc-ref %outputs "out") #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR="
"/lib")
(string-append "-DSPIRV-Headers_SOURCE_DIR="
(assoc-ref %build-inputs (assoc-ref %build-inputs
"spirv-headers"))))) "spirv-headers")))))
(inputs `(("spirv-headers" ,spirv-headers))) (inputs `(("spirv-headers" ,spirv-headers)))