From a9f1f987e791a668f90fcd9bca840b1dd7c3629d Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 19 Nov 2022 23:02:46 +0800 Subject: [PATCH] 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 --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 4cc4307977..b73db744f2 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -408,17 +408,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 @@ -442,6 +442,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