diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2025-03-21 12:03:19 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2025-06-08 15:35:25 -0400 |
| commit | 34b46b99508d5602e5a56140e134a885869af344 (patch) | |
| tree | b4fec3761d612edcc82e1c0a940d035edef3e2a7 | |
| parent | c391bcd1a9f48707a11fa8e081b1b3dcc4630077 (diff) | |
gnu: spirv-cross: Update to 1.4.309.0.
* gnu/packages/vulkan.scm (spirv-cross): Update to 1.4.309.0.
[arguments]<tests?>: Disable for now due to upstream issue hit when
update-reference-shaders phase is run, which is necessary to run the tests
successfully.
<phases>: Make the update-reference-shaders phase only run if tests are
enabled.
Change-Id: If496a258595af1bebf214972879ff6b4362e9743
| -rw-r--r-- | gnu/packages/vulkan.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ed6c3d2e04..3fa9dcc785 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -117,7 +117,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (define-public spirv-cross (package (name "spirv-cross") - (version "1.3.280.0") + (version "1.4.309.0") (source (origin (method git-fetch) @@ -125,11 +125,15 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (url "https://github.com/KhronosGroup/SPIRV-Cross") (commit (string-append "vulkan-sdk-" version)))) (sha256 - (base32 "1k6fbkradknxis85akzzksz9ipm3v42xvrzaamwj2lrgfm8d6r4d")) + (base32 "1sckwqz67mh48zypgr1r9x101mcq1dlkh8sxi341ynrxzjk8rm3j")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(;; Disable tests for now due to upstream issue hit when running + ;; update-reference-shaders phase: + ;; <https://github.com/KhronosGroup/SPIRV-Tools/issues/5980>. + #:tests? #f + #:configure-flags (list "-DSPIRV_CROSS_SHARED=YES") #:phases (modify-phases %standard-phases @@ -142,9 +146,10 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) (add-before 'check 'update-reference-shaders - (lambda _ - (with-directory-excursion "../source" - (invoke "./update_test_shaders.sh"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh")))))))) (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python)) |