From patchwork Thu May 4 20:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49802 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 6F54027BBE9; Thu, 4 May 2023 21:13:41 +0100 (BST) 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=unavailable 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 4B51427BBE2 for ; Thu, 4 May 2023 21:13:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufK4-0007Ob-RE; Thu, 04 May 2023 16:13:04 -0400 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 1pufK2-0007Lt-M8 for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 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 1pufK2-0006qG-8r for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufK2-000897-4W for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 1/4] 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: Thu, 04 May 2023 20:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323116231247 (code B ref 63219); Thu, 04 May 2023 20:13:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:12:42 +0000 Received: from localhost ([127.0.0.1]:52143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJh-00087v-HB for submit@debbugs.gnu.org; Thu, 04 May 2023 16:12:41 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:56835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJf-00087Y-GS for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:12:40 -0400 Date: Thu, 04 May 2023 20:12:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231153; x=1683490353; bh=vixj9XIYRm2gNp2J6c7vSww3fUz3dCObaj2JEM+6ezA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ZqziUhFXx8BkE3Bs0vyjjvhw5WqnzLPul9RBvED7jgHLNYjrgPoE1nEYXKlxpJ4XD Nj1QpneHvlDXZ40NG8NZdbNRxvC5WFyO7FQmudDjQOdZzGQUu6BmSMVb8HkRsSwQ1B oN+qk2JHQZUrM2eT1+OSNBWksofA8F9D4PzsV/gmcCG21OZh2NESzG5pp+mWZEPoHJ hxK8T+YlO1MtBLzV5X8b6tNzk069XnHQHZhkOKfqBgaIA0KtqBNb5Vx7xCsTqXftk2 INtaNl/kTiKJZhYX+jPqc+mMQGTgFV9gexzxfajjGbFxxLaDVL/5nKgmWsDiYwbldu uRT1s6boxdD8Q== Message-ID: <4b3b466bdacfc3c1196ce0a7198559a52c0a020d.1683230943.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 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 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) -- 2.39.2 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 ;;; Copyright © 2021, 2022 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; 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