02/02: gnu: spirv-llvm-translator: Rewrite using g-exps.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 1615084a9a4115d48b75b3db048761e7534efc87
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Jun 3 09:57:32 2024 +0300

    gnu: spirv-llvm-translator: Rewrite using g-exps.
    
    * gnu/packages/vulkan.scm (spirv-llvm-translator)[arguments]: Rewrite
    using g-expressions.
    
    Change-Id: If0025060e5aa24a9d90724966887ea03f4f8c4b3
---
 gnu/packages/vulkan.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index e46cbed4f5..25542c1e06 100644
--- a/gnu/packages/vulkan.scm
+++ b/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";)