~ruther/guix-local: gnu: vulkan-tools: Fix loading of libvulkan.

5aa814d69aa14b69e0b81c4d3a0b75550d743f6b — John Kehayias 5 months ago d260134

gnu: vulkan-tools: Fix loading of libvulkan.

Volk dependency was removed upstream and now uses direct dlopen call.

* gnu/packages/vulkan.scm (vulkan-tools)[arguments]<#:phases>: Add
patch-libvulkan-file-name phase so that dlopen will work.
[native-inputs]: Remove vulkan-volk.

Change-Id: Id7d442fea945f1e0a77028c0ea22e148b6cc6801

patch browse .tar.gz

1 files changed, 9 insertions(+), 1 deletions(-)

M gnu/packages/vulkan.scm

M gnu/packages/vulkan.scm => gnu/packages/vulkan.scm +9 -1

@@ 485,11 485,19 @@ and the ICD.")
       (inputs
        (list glslang libxrandr vulkan-loader wayland wayland-protocols))
       (native-inputs
-       (list googletest pkg-config python vulkan-volk vulkan-headers))
+       (list googletest pkg-config python vulkan-headers))
       (arguments
        (list
         #:configure-flags #~(list "-DBUILD_TESTS=ON")
         #:phases #~(modify-phases %standard-phases
+                     (add-after 'unpack 'patch-libvulkan-file-name
+                       (lambda* (#:key inputs #:allow-other-keys)
+                         (substitute* '("vulkaninfo/vulkaninfo_functions.h"
+                                        "cube/cube_functions.h")
+                           (("dlopen\\(\"libvulkan.so.1")
+                            (string-append "dlopen(\""
+                                           (search-input-file
+                                            inputs "/lib/libvulkan.so.1"))))))
                      (replace 'check
                        (lambda* (#:key tests? #:allow-other-keys)
                          (when tests?