From 18ac48364cb7e17da120b4b296aa06de5f159497 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 17:52:15 +0200 Subject: gnu: shaderc: Enable (some) tests. * gnu/packages/vulkan.scm (shaderc)[arguments]: Remove #:tests?. Add substitution to use "spirv-dis" from inputs instead of bundled. --- gnu/packages/vulkan.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a96b33c74f..59dbfae11d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -266,7 +266,8 @@ (define-public shaderc "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; FIXME: Tests fail. + `(;; FIXME: Skip most of the tests, because enabling system gtest breaks + ;; the build: . #:configure-flags '("-DSHADERC_SKIP_TESTS=ON") #:phases (modify-phases %standard-phases @@ -276,6 +277,10 @@ (define-public shaderc (("add_subdirectory\\(third_party\\)") "")) + (substitute* "glslc/test/CMakeLists.txt" + (("\\$") + (which "spirv-dis"))) + ;; Do not attempt to use git to encode version information. (substitute* "glslc/CMakeLists.txt" (("add_dependencies\\(glslc_exe build-version\\)") -- cgit v1.2.3