apteryx pushed a commit to branch master
in repository guix.
commit 61a326442442f9b09911d35b3a3a48cf5335d7d7
Author: Kaelyn Takata <[email protected]>
AuthorDate: Thu May 4 20:12:26 2023 +0000
gnu: mesa: Fix library paths in Vulkan layer manifests.
* gnu/packages/gl.scm (mesa): Fix library paths in Vulkan layer manifests.
Signed-off-by: Maxim Cournoyer <[email protected]>
---
gnu/packages/gl.scm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 3a63d70c7a..6521170ebb 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Ivan Gankevich <[email protected]>
;;; Copyright © 2021, 2022 John Kehayias <[email protected]>
;;; Copyright © 2022 Petr Hodina <[email protected]>
+;;; Copyright © 2023 Kaelyn Takata <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -488,7 +489,28 @@ svga,swrast,virgl")))
file)
(symlink reference file)))
others))))
- (delete-duplicates inodes))))))))
+ (delete-duplicates inodes)))))
+ (add-after 'install 'set-layer-path-in-manifests
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (implicit-path (string-append
+ out
+ "/share/vulkan/implicit_layer.d/"))
+ (explicit-path (string-append
+ out
+ "/share/vulkan/explicit_layer.d/"))
+ (fix-layer-path
+ (lambda (layer-name)
+ (let* ((explicit (string-append explicit-path
layer-name ".json"))
+ (implicit (string-append implicit-path
layer-name ".json"))
+ (manifest (if (file-exists? explicit)
+ explicit
+ implicit)))
+ (substitute* manifest
+ (((string-append "\"lib" layer-name ".so\""))
+ (string-append "\"" out "/lib/lib" layer-name
".so\"")))))))
+ (for-each fix-layer-path '("VkLayer_MESA_device_select"
+ "VkLayer_MESA_overlay"))))))))
(home-page "https://mesa3d.org/";)
(synopsis "OpenGL and Vulkan implementations")
(description "Mesa is a free implementation of the OpenGL and Vulkan
