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

gnu: spirv-tools: Update to commit 90862fe4b1c6763b32ce683d2d32c2f281f577cf. 

* gnu/packages/vulkan.scm (spirv-tools): Update to commit
90862fe4b1c6763b32ce683d2d32c2f281f577cf.
This commit is contained in:
Rutger Helling 2018-01-31 14:20:02 +01:00
parent a4f99103ca
commit a9342820d3
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
gnu/packages/vulkan.scm
View File

@ -74,36 +74,41 @@ and for the GLSL.std.450 extended instruction set.
commit "/LICENSE")))))) commit "/LICENSE"))))))
(define-public spirv-tools (define-public spirv-tools
(package ;; Keep updated in accordance with
(name "spirv-tools") ;; https://github.com/google/shaderc/blob/known-good/known_good.json
(version "2017.1") (let ((commit "90862fe4b1c6763b32ce683d2d32c2f281f577cf")
(source (revision "1"))
(origin (package
(method url-fetch) (name "spirv-tools")
(uri (string-append "https://github.com/KhronosGroup/SPIRV-Tools/archive/v" (version (string-append "0.0-" revision "." (string-take commit 9)))
version ".tar.gz")) (source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/SPIRV-Tools")
(commit commit)))
(sha256 (sha256
(base32 (base32
"009vflaa71a7xhvmm23f4sdbcgdkl1k4facqkwsg6djha2sdpsqq")) "1yq8ab6f52wcxm2azzmx70nqz8l35izd45830aikjkk1jfzmzabb"))
(file-name (string-append name "-" version ".tar.gz")))) (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=" `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib") "/lib")
(string-append "-DSPIRV-Headers_SOURCE_DIR=" (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)))
(native-inputs `(("pkg-config", pkg-config) (native-inputs `(("pkg-config", pkg-config)
("python" ,python))) ("python" ,python)))
(home-page "https://github.com/KhronosGroup/SPIRV-Tools") (home-page "https://github.com/KhronosGroup/SPIRV-Tools")
(synopsis "API and commands for processing SPIR-V modules") (synopsis "API and commands for processing SPIR-V modules")
(description (description
"The SPIR-V Tools project provides an API and commands for processing "The SPIR-V Tools project provides an API and commands for processing
SPIR-V modules. The project includes an assembler, binary module parser, SPIR-V modules. The project includes an assembler, binary module parser,
disassembler, validator, and optimizer for SPIR-V.") disassembler, validator, and optimizer for SPIR-V.")
(license license:asl2.0))) (license license:asl2.0))))
(define-public glslang (define-public glslang
;; Version 3.0 is too old for vulkan-icd-loader. Use a recent git commit ;; Version 3.0 is too old for vulkan-icd-loader. Use a recent git commit