diff mbox series

[bug#59386,09/11] gnu: vulkan-validationlayers: Update to sdk-1.3.231.1.

Message ID 20221119150248.19150-9-i@dan.games
State New
Headers show
Series Update vulkan-sdk packages to sdk-1.3.231.1. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch fail
cbaines/issue success View issue

Commit Message

dan Nov. 19, 2022, 3:02 p.m. UTC 
* gnu/packages/vulkan.scm (vulkan-validationlayers): Update to sdk-1.3.231.1.
---
 gnu/packages/vulkan.scm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Comments

Marius Bakke Nov. 20, 2022, 8:11 a.m. UTC | #1 
dan <i@dan.games> skriver:

> * gnu/packages/vulkan.scm (vulkan-validationlayers): Update to sdk-1.3.231.1.

This forgot to mention the changes to [arguments].

[...]

> @@ -435,16 +435,10 @@ (define-public vulkan-validationlayers
>       (list #:tests? #f ;no tests
>             #: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"))))
> +                   (string-append "-DGLSLANG_INSTALL_DIR=" #$glslang)
> +                   (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" #$spirv-headers)
> +                   (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" #$spirv-tools)
> +                   (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" #$vulkan-headers)

Avoid referencing variables directly in arguments.  Otherwise
transformations such as --with-input etc can't work.

I reverted back to the original (but arguably ugly!)
search-input-directory style, and added similar incantations for
SPIRV_TOOLS_INSTALL_DIR and VULKAN_HEADERS_INSTALL_DIR.
diff mbox series

Patch

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 3c094cd3d3..330df898e5 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -411,17 +411,17 @@  (define-public vkd3d
 (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
@@ -435,16 +435,10 @@  (define-public vulkan-validationlayers
      (list #:tests? #f ;no tests
            #: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"))))
+                   (string-append "-DGLSLANG_INSTALL_DIR=" #$glslang)
+                   (string-append "-DSPIRV_HEADERS_INSTALL_DIR=" #$spirv-headers)
+                   (string-append "-DSPIRV_TOOLS_INSTALL_DIR=" #$spirv-tools)
+                   (string-append "-DVULKAN_HEADERS_INSTALL_DIR=" #$vulkan-headers)
                    "-Wno-dev")
            #:phases #~(modify-phases %standard-phases
                         (add-after 'install 'set-layer-path-in-manifest