all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kaelyn Takata via Guix-patches via <guix-patches@gnu.org>
To: 63219@debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Subject: [bug#63219] [PATCH mesa-branch v3 1/4] gnu: mesa: Fix library paths in Vulkan layer manifests.
Date: Thu, 04 May 2023 20:12:26 +0000	[thread overview]
Message-ID: <4b3b466bdacfc3c1196ce0a7198559a52c0a020d.1683230943.git.kaelyn.alexi@protonmail.com> (raw)
In-Reply-To: <cover.1683230943.git.kaelyn.alexi@protonmail.com>

* gnu/packages/gl.scm (mesa): Fix library paths in Vulkan layer manifests.
---
 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 @@ (define-public mesa
                                                        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
--
2.39.2






  reply	other threads:[~2023-05-04 20:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-02  0:59 [bug#63219] [PATCH mesa-branch 0/4] Mesa update plus various fixes and cleanups Kaelyn Takata via Guix-patches via
2023-05-02  1:01 ` [bug#63219] [PATCH mesa-branch 1/4] gnu: mesa: Fix library paths in Vulkan layer manifests Kaelyn Takata via Guix-patches via
2023-05-02  1:02 ` [bug#63219] [PATCH mesa-branch 2/4] gnu: mesa: Use gexps instead of quasiquote Kaelyn Takata via Guix-patches via
2023-05-02  1:02 ` [bug#63219] [PATCH mesa-branch 3/4] gnu: mesa: Fix hardware video decoding Kaelyn Takata via Guix-patches via
2023-05-02  1:02 ` [bug#63219] [PATCH mesa-branch 4/4] gnu: mesa: Update to 23.0.3 Kaelyn Takata via Guix-patches via
2023-05-02  4:44 ` [bug#63219] [PATCH mesa-branch v2 2/4] gnu: mesa: Use gexps instead of quasiquote Kaelyn Takata via Guix-patches via
2023-05-04 20:12 ` [bug#63219] [PATCH mesa-branch v3 0/4] Mesa update plus various fixes and cleanups Kaelyn Takata via Guix-patches via
2023-05-04 20:12   ` Kaelyn Takata via Guix-patches via [this message]
2023-05-04 20:12   ` [bug#63219] [PATCH mesa-branch v3 2/4] gnu: mesa: Use gexps instead of quasiquote Kaelyn Takata via Guix-patches via
2023-05-04 20:12   ` [bug#63219] [PATCH mesa-branch v3 3/4] gnu: mesa: Fix hardware video decoding Kaelyn Takata via Guix-patches via
2023-05-04 20:12   ` [bug#63219] [PATCH mesa-branch v3 4/4] gnu: mesa: Update to 23.0.3 Kaelyn Takata via Guix-patches via
2023-05-05  6:34 ` [bug#63219] [PATCH mesa-branch 0/4] Mesa update plus various fixes and cleanups Brendan Tildesley
2023-05-07 17:07   ` Maxim Cournoyer
2023-05-07 19:35     ` Kaelyn via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4b3b466bdacfc3c1196ce0a7198559a52c0a020d.1683230943.git.kaelyn.alexi@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=63219@debbugs.gnu.org \
    --cc=kaelyn.alexi@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.