From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0Lr8E1gu6WNpZAEAbAwnHQ (envelope-from ) for ; Sun, 12 Feb 2023 19:22:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GD76E1gu6WNbQQEAauVa8A (envelope-from ) for ; Sun, 12 Feb 2023 19:22:16 +0100 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 2B99DF00A for ; Sun, 12 Feb 2023 19:22:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRGzG-0006Yt-Up; Sun, 12 Feb 2023 13:22:06 -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 1pRGzC-0006WU-Kq for guix-patches@gnu.org; Sun, 12 Feb 2023 13:22: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 1pRGzC-0001GD-8T for guix-patches@gnu.org; Sun, 12 Feb 2023 13:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pRGzB-00046h-R4 for guix-patches@gnu.org; Sun, 12 Feb 2023 13:22:01 -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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Feb 2023 18:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 59453@debbugs.gnu.org Received: via spool by 59453-submit@debbugs.gnu.org id=B59453.167622606815694 (code B ref 59453); Sun, 12 Feb 2023 18:22:01 +0000 Received: (at 59453) by debbugs.gnu.org; 12 Feb 2023 18:21:08 +0000 Received: from localhost ([127.0.0.1]:46706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRGyJ-000453-KF for submit@debbugs.gnu.org; Sun, 12 Feb 2023 13:21:08 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:49635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pRGyE-00043t-AQ for 59453@debbugs.gnu.org; Sun, 12 Feb 2023 13:21:06 -0500 Date: Sun, 12 Feb 2023 18:20:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1676226056; x=1676485256; bh=YxBYurU5TPA78HeQNhJzVLFsvwPcecODQrIrQWb27+c=; 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=rJYtr76QEWtfsdPw7fsUsrMDcRp1mOvIx1Kmu+mgmYehgvssfGQReKIbGjisgutD2 8jgQyo2uD7aSPmb+3lyn46dbWAJvJULVqrWMK+/XT/DzmhlRUGI5qcsTP0Q6YUYFfQ By1BJH4lW3ermX8vl/Fc6xNnmvEq8+9oBfn3MCrJ/tD/TlSZFVrqRmA56w1QLzt8uD YnQArL0dl3R516XjOiPeJbBBk/cxT4IK7tmMMXDRGIvLh2GR2c4NX5/GimrC5mKRhw X23STpYp38/tFKGArUnEhg5FbxY2uw753RxzRVCWup0WdgpCRRbnw/uPT3k2XzIbkg Z1//rHFy/3AuQ== Message-ID: In-Reply-To: <193fa946-8ac2-823d-78fd-6210199cf804@makinata.eu> References: <4782cd33fae4a0f5e120dab213753d9d51b6d94a.1669057759.git.kaelyn.alexi@protonmail.com> <193fa946-8ac2-823d-78fd-6210199cf804@makinata.eu> 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 X-ACL-Warn: , Kaelyn via Guix-patches From: Kaelyn 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676226136; a=rsa-sha256; cv=none; b=fVgWPNUh/dhw49kIBQlI62osgT8GuvATDSV951UcMv2J3LalkmqiumoDyvPkhLfTmLGcAg Mn5Zk9FMKJc1+8hr9ug9mLkVxi/Lv2nu6HHesTMH/Yj2QR0bqzQGyhhOkBMGqsoaVwVGot ffaRMqTuc8x9KHt2p8oEBY6D7p45ObtXK4zh/XHOiHrBAb6Hn/6rhKT5x2cpd7sp88dipj c2qaBIi6kLIBNnicnZXCE/+KDZbnllwah9Rhxs+BmGcqA4wnv1xkynM5BygpBho6s+5MUh 2HYQHWO0H6GOGrN9qA6v03BF6NRsPdGbpu47uawOz+DHifwQlhdIuZ3bOUtNpQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=rJYtr76Q; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676226136; 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=YxBYurU5TPA78HeQNhJzVLFsvwPcecODQrIrQWb27+c=; b=joNeQ9Vmai2bfSR72Kcx4JVBj1nfRrHu64/2ZwaDuDirrOUq3Kug/lxBzNgP1iT6wxlIYp sadPRP3TqbeOHS97yvDRNjHgw7pW98U/IhdfINKJia6Nd+35GiTs74Z34PN23+v+d+Rimz TWrJrqYlYttDyD9tQFOoUzSwmpA0tylTNPD5Wn8qDCYWIEW5U46ocBuVDKBv8cC2uwZvvr 9/rplWBgTM8wvCsgpg41kDabaBcAIC7C5Jym3ABUJWp91RwRl6OK5SBHXfPW/CrHodaoRE 1ds9gS7XyvCrFi9NtzX+09J86ZyjizPkWoBBQwuszJU4qvZOdAMCxT3WtiBSFw== X-Migadu-Spam-Score: -3.62 X-Spam-Score: -3.62 X-Migadu-Queue-Id: 2B99DF00A X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=rJYtr76Q; 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"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: v1PgZ+PErHsW ------- Original Message ------- On Saturday, January 21st, 2023 at 4:16 PM, Bruno Victal wrote: > > On 2022-11-21 19:09, Kaelyn Takata via Guix-patches via wrote: > > > * gnu/packages/gl.scm (mesa): Fix library paths in Vulkan layer manifes= ts. > > --- > > gnu/packages/gl.scm | 23 ++++++++++++++++++++++- > > 1 file changed, 22 insertions(+), 1 deletion(-) > > > > 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")) > > > Using G-Expressions would be better here, since you're modifying this pac= kage, > you could take the opportunity to modernize/rewrite this package definiti= on using G-Expressions. > (Keep the rewrite and this fix in separate commits) Given the complexity of the mesa package definition including the numerous = matches on %current-system, I'm not confident or comfortable in my ability = to rewrite mesa's package-arguments to use gexps. I certainly don't want to= delay fixing the Vulkan layer library paths on core-updates packages even = longer than it already has been trying to rewrite a complex core package. Cheers, Kaelyn > > > + (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 > > > > base-commit: affaacf4f46639dcc8239a438cad11c2a6ef6c9a > > -- > > 2.38.1