summary refs log tree commit diff
diff options
context:
space:
mode:
authordan <i@dan.games>2022-11-19 23:02:46 +0800
committerMarius Bakke <marius@gnu.org>2022-11-20 09:24:54 +0100
commit46774bc9d7ee049fd02adf690aadb5ab6d10a02f (patch)
treee733dbbdc07130b130ba95c544471fc0e0c058c7
parentcc1a48f967c3d023d34ca7555372bfe778c2f00c (diff)
downloadguix-46774bc9d7ee049fd02adf690aadb5ab6d10a02f.tar.gz
gnu: vulkan-validationlayers: Update to sdk-1.3.231.1.
* gnu/packages/vulkan.scm (vulkan-validationlayers): Update to sdk-1.3.231.1.
[arguments]: Specify install directory for spirv-tools and vulkan-headers.

Co-authored-by: Marius Bakke <marius@gnu.org>
-rw-r--r--gnu/packages/vulkan.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 3c094cd3d3..3403c89a29 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -411,17 +411,17 @@ shader compilation.")
 (define-public vulkan-validationlayers
   (package
     (name "vulkan-validationlayers")
-    (version "1.2.201")
+    (version %vulkan-sdk-version)
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url
                      "https://github.com/KhronosGroup/Vulkan-ValidationLayers")
-                    (commit (string-append "v" version))))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1jnz9cmy5d5g6jh9p4wr0qrlqlpfp07b3cizq37i5p1bcabdgmrz"))))
+                "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75"))))
     (build-system cmake-build-system)
     (inputs (list glslang
                   libxrandr
@@ -445,6 +445,16 @@ shader compilation.")
                                             (search-input-directory
                                              %build-inputs
                                              "include/spirv"))))
+                   (string-append "-DSPIRV_TOOLS_INSTALL_DIR="
+                                  (dirname (dirname
+                                            (search-input-directory
+                                             %build-inputs
+                                             "include/spirv-tools"))))
+                   (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
+                                  (dirname (dirname
+                                            (search-input-directory
+                                             %build-inputs
+                                             "include/vulkan"))))
                    "-Wno-dev")
            #:phases #~(modify-phases %standard-phases
                         (add-after 'install 'set-layer-path-in-manifest