From patchwork Mon Nov 21 19:09:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 44757 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 55AD427BBED; Mon, 21 Nov 2022 19:11:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 475DD27BBEC for ; Mon, 21 Nov 2022 19:11:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxCC8-00071u-TR; Mon, 21 Nov 2022 14:11:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxCC6-00071f-Uy for guix-patches@gnu.org; Mon, 21 Nov 2022 14:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxCC6-0007Dz-F6 for guix-patches@gnu.org; Mon, 21 Nov 2022 14:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oxCC6-0001H3-0n for guix-patches@gnu.org; Mon, 21 Nov 2022 14:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59453] [PATCH core-updates] gnu: mesa: Fix library paths in Vulkan layer manifests. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Nov 2022 19:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59453@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16690578124820 (code B ref -1); Mon, 21 Nov 2022 19:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Nov 2022 19:10:12 +0000 Received: from localhost ([127.0.0.1]:48854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxCBH-0001Fg-UK for submit@debbugs.gnu.org; Mon, 21 Nov 2022 14:10:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:40536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxCBG-0001FV-1q for submit@debbugs.gnu.org; Mon, 21 Nov 2022 14:10:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxCBF-0006za-0p for guix-patches@gnu.org; Mon, 21 Nov 2022 14:10:09 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxCBC-0006mw-8x for guix-patches@gnu.org; Mon, 21 Nov 2022 14:10:08 -0500 Date: Mon, 21 Nov 2022 19:09:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1669057795; x=1669316995; bh=viG4+WRfnocCbqD2OLc5rHHtbYltWwNN8xgOCZgYQwM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=PDdb17AIjJI4+CeoZX2dltowAaEUxPYLWkajNq2lrmsJp/ZIOOOgk8IBIlD71uW5B iX9EtHK0vIbIELi1CLZC7Zv/x/7YNM8MjONrsTmCvR48uoKnNKcFM/w7DzeAX4VhzG w9HM6Pyhj7xyA+39Jo6idVvhqQZOBIawixyUEuPEUqlTHO/u5ywfQ+VMw79ndJKhkL J5NJ/mK7tKm5fCsIIVA4BxXIEgY2uSfUEjnt6ymGxu7ZOnYkdGJWnmwgPcaPxyTC6/ 0zMJPTOEY6ozJKDi7/tJHXieH9muq9lC5eYculgBgwpFNXFC9fiHi7/XowNkx8Vm3M BhXES9F7aNhNg== Message-ID: <4782cd33fae4a0f5e120dab213753d9d51b6d94a.1669057759.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (mesa): Fix library paths in Vulkan layer manifests. --- gnu/packages/gl.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) base-commit: affaacf4f46639dcc8239a438cad11c2a6ef6c9a -- 2.38.1 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dd62fac13e..c26a51cb32 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -488,7 +488,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