02/16: gnu: spirv-llvm-translator: Patch renamed identifier.

[guix-commits]

rekado pushed a commit to branch wip-python-team
in repository guix.

commit 4b109e8b4a43d91526d5659ecdbeaa7de9163331
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Apr 22 23:37:55 2024 +0200

    gnu: spirv-llvm-translator: Patch renamed identifier.
    
    * gnu/packages/vulkan.scm (spirv-llvm-translator)[arguments]: Use 
G-expression
    for configure flags; add phase 'compat to replace references to
    "CapabilityLongConstantCompositeINTEL".
    
    Change-Id: I91e1b2f626cfae812a741b3100c5e0759b18aa71
---
 gnu/packages/vulkan.scm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 23d0c72ee3..8e415f362f 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
 ;;; Copyright © 2022, 2024 dan <i@dan.games>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -167,14 +168,24 @@ SPIR-V, aiming to emit GLSL or MSL that looks like 
human-written code.")
         (base32 "0lix3bpli7i9csz26bq0d9g1v7c0gim498m5bm2gp8kifj2yih1s"))))
     (build-system cmake-build-system)
     (arguments
-     `(#: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")
-             "-DLLVM_SPIRV_INCLUDE_TESTS=ON")))
+     (list
+      #:configure-flags
+      #~(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")
+              "-DLLVM_SPIRV_INCLUDE_TESTS=ON")
+      #:phases
+      '(modify-phases %standard-phases
+         (add-after 'unpack 'compat
+           (lambda _
+             ;; This has been fixed some time in 2023, but version 15.0.0 is
+             ;; from before that time.
+             (substitute* (find-files "lib/SPIRV/libSPIRV")
+               (("CapabilityLongConstantCompositeINTEL")
+                "CapabilityLongCompositesINTEL")))))))
     (inputs (list llvm-15))
     (native-inputs (list clang-15 llvm-15 python-lit spirv-headers))
     (home-page "https://github.com/KhronosGroup/SPIRV-LLVM-Translator";)