From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OOmlKfURVGT3JgAASxT56A (envelope-from ) for ; Thu, 04 May 2023 22:13:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 2HnPKfURVGTbbgAA9RJhRA (envelope-from ) for ; Thu, 04 May 2023 22:13:41 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 58E27BD3A for ; Thu, 4 May 2023 22:13:41 +0200 (CEST) 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683231221; a=rsa-sha256; cv=none; b=SIdTPDhUarfHgpHZF4VWTJgJRYgCLd91pU89ndB/I9ydYTtVLYVG/PrUEuF/blH8jXBFU4 PK8LcBQnvn0CGwVFkK1uZrhVy8OaWDhVsKsTY7jtmlGHh9ofbbxnzPwPpnVptJ8P/2jAl1 QxL6jUhCSKdFSBCvcoRYM+oxhKCMuIs1e2HDLCMNtjiY007ZUmKigTUtLDbET/JJz434js JkLkBX+HTw1bAZ74n3zWk10FbfknVBEqeuXXhaFLco2fWeqA1oe+RoLmJdsF21sZR/GanS YFO+u7sPECN0yVAmAxzZZHa2j7nuWfYBv58Agj8cr4E8BJLF3TTfMgcHUyVWvg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=ZqziUhFX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683231221; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=vixj9XIYRm2gNp2J6c7vSww3fUz3dCObaj2JEM+6ezA=; b=nG3hY2Zm8SdI3gZ6lnAjAQibhpJh0jPvQIj5TLQmJEjtTj3i0i32j1m44gMgZjKD/bHmp6 NQlSPDSfOkOkurnDCIucqS4izU/WTrL7+LB0Zymgw/GxbKXoRDTA5SI6RfMugl0A6za/jB daHgp+hJmR9j44mSO/5R74UKTFx6PTr2JilrA6klnn7PCRoeLTwSenbZ9bL5KgxE5aFytW G6GHOu1lfbXJthB1q/lrW5HtmXhpcmB4qaUi12paeaZ5UkyUHugvLerd3GF2WsRvU2upS7 5cjoHd5RZ+slZ0wiXe+pwrWLWlmLtNfMe5WpRgN+JjtoRMSg3u8SqLg6Yw/rCg== X-Migadu-Spam-Score: -1.41 X-Spam-Score: -1.41 X-Migadu-Queue-Id: 58E27BD3A X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=ZqziUhFX; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: 95BhO8cQ73uu * 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 =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021, 2022 John Kehayias ;;; Copyright =C2=A9 2022 Petr Hodina +;;; Copyright =C2=A9 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 -- 2.39.2