~ruther/guix-local: gnu: vulkan-validationlayers: Avoid direct variable references.

078f33e4206be799adde55eaac9a5b3125fb392d — Marius Bakke 3 years ago bf3ef80

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.

patch browse .tar.gz .zip

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

M gnu/packages/vulkan.scm

M gnu/packages/vulkan.scm => gnu/packages/vulkan.scm +13 -6

@@ 417,12 417,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 _