--- Begin Message ---
|
Subject: |
[PATCH][staging] gnu: vulkan-loader: Add native-search-paths field. |
|
Date: |
Sun, 30 Oct 2022 13:41:38 +0800 |
* gnu/packages/vulkan.scm (vulkan-loader): Add native-search-paths field.
[source]: Change ICD and implicit layers looking up behaviour via snippet.
---
gnu/packages/vulkan.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index f5c619a2b2..1371860583 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -215,6 +215,22 @@ (define-public vulkan-loader
(url "https://github.com/KhronosGroup/Vulkan-Loader";)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(substitute* "loader/loader.c"
+ ;; v1.3.207-
+ (("VK_ICD_FILENAMES_ENV_VAR, NULL")
+ "\"VK_ICD_PATH\", override_paths")
+ (("false, NULL, NULL")
+ "false, \"VK_ILAYER_PATH\", override_paths")
+ ;; v1.3.207+
+ (("VK_ICD_FILENAMES_ENV_VAR")
+ "\"VK_ICD_PATH\"")
+ (("relative_location = VK_ILAYERS_INFO_RELATIVE_DIR;" all)
+ (string-append "override_env = loader_secure_getenv"
+ "(\"VK_ILAYER_PATH\", inst);" all))
+ (("\\(IMPLICIT_LAYER, \\)NULL" m)
+ (string-append m "override_paths"))))
(sha256
(base32
"15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv"))))
@@ -251,6 +267,13 @@ (define-public vulkan-loader
("wayland" ,wayland)))
(inputs
(list vulkan-headers))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "VK_ICD_PATH")
+ (files '("share/vulkan/icd.d")))
+ (search-path-specification
+ (variable "VK_ILAYER_PATH")
+ (files '("share/vulkan/implicit_layer.d")))))
(home-page
"https://github.com/KhronosGroup/Vulkan-Loader";)
(synopsis "Khronos official ICD loader and validation layers for Vulkan")
base-commit: 63bf06013820aa26aca7dc8f18cb79403b94e9a5
--
2.38.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#58887] [PATCH][staging] gnu: vulkan-loader: Add native-search-paths field. |
|
Date: |
Mon, 19 Jun 2023 14:14:44 +0800 |
On Mon, 19 Jun 2023 00:31:25 +0800,
Kaelyn via Guix-patches via wrote:
>
> While the original patch description doesn't mention why the
> native-search-paths variables and associated snippet are needed, if they are
> to fix error messages like:
>
>
> !! validation layer: libVkLayer_MESA_device_select.so: cannot open shared
> object file: No such file or directory
>
> when running Vulkan programs including vulkaninfo, then this issue can be
> closed. Commit 61a326442442f9b09911d35b3a3a48cf5335d7d7 fixed the remaining
> Vulkan layer manifest files to include the full paths to the shared
> libraries, which resolved the error messages like the one above about not
> finding the shared object files for layers without introducing new
> environment variables.
Thank you!
--- End Message ---