08/08: gnu: vulkan-validationlayers: Avoid direct variable references.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 29754d3683acd188c2c461b934227ba1d909ac63
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Nov 15 13:16:18 2022 +0100

    gnu: vulkan-validationlayers: Avoid direct variable references.
    
    * gnu/packages/vulkan.scm (vulkan-validationlayers)[arguments]: Refer to
    GLSLANG and SPIRV-HEADERS from inputs, instead of the global variables.
---
 gnu/packages/vulkan.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 8f664334d4..c00c06d7f3 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -420,12 +420,19 @@ shader compilation.")
     (native-inputs (list pkg-config python spirv-headers vulkan-headers))
     (arguments
      (list #:tests? #f ;no tests
-           #:configure-flags #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
-                                     (string-append "-DGLSLANG_INSTALL_DIR="
-                                                    #$glslang)
-                                     (string-append
-                                      "-DSPIRV_HEADERS_INSTALL_DIR="
-                                      #$spirv-headers) "-Wno-dev")
+           #:configure-flags
+           #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
+                   (string-append "-DGLSLANG_INSTALL_DIR="
+                                  (dirname (dirname
+                                            (search-input-directory
+                                             %build-inputs
+                                             "include/glslang"))))
+                   (string-append "-DSPIRV_HEADERS_INSTALL_DIR="
+                                  (dirname (dirname
+                                            (search-input-directory
+                                             %build-inputs
+                                             "include/spirv"))))
+                   "-Wno-dev")
            #:phases #~(modify-phases %standard-phases
                         (add-after 'install 'set-layer-path-in-manifest
                           (lambda _