diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
| commit | d88cee1d44a475b6ea276e87a4c98682255b881e (patch) | |
| tree | f2e681b5211840d4eef688120041c2dd730002cc /gnu/packages/vulkan.scm | |
| parent | d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d (diff) | |
| parent | 20059f92a97726b40d4d74e67463a64c98d1da0d (diff) | |
| download | guix-d88cee1d44a475b6ea276e87a4c98682255b881e.tar.gz | |
Merge branch 'master' into staging.
With conflicts resolved in: gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/vulkan.scm')
| -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 e7f507fe85..522b6402ad 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -128,11 +128,6 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (arguments `(#:configure-flags (list "-DSPIRV_CROSS_SHARED=YES") - ;; FIXME: The following tests fail: - ;; 15 - spirv-cross-test-opt - ;; 16 - spirv-cross-test-metal-opt - ;; 17 - spirv-cross-test-hlsl-opt - #:tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-tests-to-find-deps @@ -142,8 +137,11 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (string-append (assoc-ref inputs "glslang") "/bin"))) (substitute* "CMakeLists.txt" (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") - (string-append (assoc-ref inputs "spirv-tools") "/bin"))) - #t))))) + (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) + (add-before 'check 'update-reference-shaders + (lambda _ + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh"))))))) (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python)) |