[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: gnu: mesa: Fix library paths in Vulkan layer manifests.
From: |
guix-commits |
Subject: |
01/09: gnu: mesa: Fix library paths in Vulkan layer manifests. |
Date: |
Sun, 7 May 2023 13:05:30 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 61a326442442f9b09911d35b3a3a48cf5335d7d7
Author: Kaelyn Takata <kaelyn.alexi@protonmail.com>
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 <maxim.cournoyer@gmail.com>
---
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 <i.gankevich@spbu.ru>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; 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
- branch master updated (4c3532d7ab -> d1aba42ad4), guix-commits, 2023/05/07
- 01/09: gnu: mesa: Fix library paths in Vulkan layer manifests.,
guix-commits <=
- 02/09: gnu: mesa: Fix hardware video decoding., guix-commits, 2023/05/07
- 03/09: gnu: mesa: Use gexps instead of quasiquote., guix-commits, 2023/05/07
- 04/09: gnu: mesa: Update to 23.0.3., guix-commits, 2023/05/07
- 05/09: gnu: libva: Update to 2.18.0., guix-commits, 2023/05/07
- 07/09: gnu: vdpauinfo: Update to 1.5., guix-commits, 2023/05/07
- 08/09: gnu: libva-utils: Update home page., guix-commits, 2023/05/07
- 09/09: gnu: nss-certs: Update to 3.88.1., guix-commits, 2023/05/07
- 06/09: gnu: libva-utils: Update to 2.18.1., guix-commits, 2023/05/07