1 files changed, 13 insertions(+), 12 deletions(-)

M gnu/packages/vulkan.scm

@@ 169,19 169,20 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.")
     (arguments
      ;; The test suite is known to fail on several architectures:
      ;; https://github.com/llvm/llvm-project/issues/59637
-     `(#:tests? ,(and (not (%current-target-system))
-                      (target-x86-64?))
+     (list
+       #:tests? (and (not (%current-target-system))
+                     (target-x86-64?))
        #:configure-flags
-       (list (string-append "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="
-                            (assoc-ref %build-inputs "spirv-headers")
-                            "/include/spirv")
-             (string-append "-DLLVM_EXTERNAL_LIT="
-                            (assoc-ref %build-inputs "python-lit")
-                            "/bin/lit")
-             (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
-                            (assoc-ref %outputs "out") "/lib")
-             "-DBUILD_SHARED_LIBS=ON"
-             "-DLLVM_SPIRV_INCLUDE_TESTS=ON")))
+       #~(list (string-append "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="
+                              #$(this-package-native-input "spirv-headers")
+                              "/include/spirv")
+               (string-append "-DLLVM_EXTERNAL_LIT="
+                              #$(this-package-native-input "python-lit")
+                              "/bin/lit")
+               (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
+                              #$output "/lib")
+               "-DBUILD_SHARED_LIBS=ON"
+               "-DLLVM_SPIRV_INCLUDE_TESTS=ON")))
     (inputs (list llvm-18))
     (native-inputs (list clang-18 llvm-18 python-lit spirv-headers))
     (home-page "https://github.com/KhronosGroup/SPIRV-LLVM-Translator")