From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 eIyvDxMQzGPFrgAAbAwnHQ (envelope-from ) for ; Sat, 21 Jan 2023 17:17:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iNbEDhMQzGNdaQAAG6o9tA (envelope-from ) for ; Sat, 21 Jan 2023 17:17:23 +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 087F5FC8F for ; Sat, 21 Jan 2023 17:17:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJGYC-0001tU-31; Sat, 21 Jan 2023 11:17: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 1pJGYB-0001tD-BZ for guix-patches@gnu.org; Sat, 21 Jan 2023 11:17:03 -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 1pJGYB-0004Jp-3y for guix-patches@gnu.org; Sat, 21 Jan 2023 11:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJGYA-0005N2-DB for guix-patches@gnu.org; Sat, 21 Jan 2023 11:17: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: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Jan 2023 16:17:02 +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: Kaelyn Takata Cc: 59453@debbugs.gnu.org Received: via spool by 59453-submit@debbugs.gnu.org id=B59453.167431779820611 (code B ref 59453); Sat, 21 Jan 2023 16:17:02 +0000 Received: (at 59453) by debbugs.gnu.org; 21 Jan 2023 16:16:38 +0000 Received: from localhost ([127.0.0.1]:49626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJGXm-0005MM-2q for submit@debbugs.gnu.org; Sat, 21 Jan 2023 11:16:38 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:49140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJGXk-0005ME-My for 59453@debbugs.gnu.org; Sat, 21 Jan 2023 11:16:37 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 2B6BB207F8; Sat, 21 Jan 2023 17:16:31 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id BFBA980093; Sat, 21 Jan 2023 17:16:31 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 0HYKq6b8EExB; Sat, 21 Jan 2023 17:16:30 +0100 (CET) Received: from [192.168.1.239] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 14DA880099; Sat, 21 Jan 2023 17:16:29 +0100 (CET) Message-ID: <193fa946-8ac2-823d-78fd-6210199cf804@makinata.eu> Date: Sat, 21 Jan 2023 16:16:28 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US References: <4782cd33fae4a0f5e120dab213753d9d51b6d94a.1669057759.git.kaelyn.alexi@protonmail.com> From: Bruno Victal In-Reply-To: <4782cd33fae4a0f5e120dab213753d9d51b6d94a.1669057759.git.kaelyn.alexi@protonmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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: , 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=1674317843; a=rsa-sha256; cv=none; b=tVA/RcfFZL3ph2Hoam2Y7PplytD6Oe8yYH1mprPQwybrmLEOKjZTclkTtXDjBj2CnOtDyX ngh8Kl4Xwqq/SQ+ezXlX+KA/9TDcYnz7Y+AKTIBoDqY6XJPRuwRd87yMN4j2CE9j0jmyGz QhjnYlbC11I/YjFVWI0Y8Q9M0K75Icb2TC6y8eXSQZffFfAJUuFzmwDANMiatWHf5xrt/3 o9cINBxUvKZ+7tsfhrb5chX+VVEyZrmf41Xxwid9O6c2v53mZoijmM49WjpR0lXWgGdTir nIqDvNmZ4UEq2/qsDYi4bMQpkN3jGnzfApa8i3VGwRaepARN+57ToEuTgfEmwQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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=1674317843; h=from:from:sender:sender: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; bh=134zGrzG+OzGQvMeMyjvpEZsZ+NMe7gOguZvQJqK1pE=; b=WogJn7HyFND1eVC3VwMPe6lrT/6+hYjlkz4u7dY4YgPxzXedwmsZes4JupdsGGlOqjQlK6 BHJDuZ8CQDosB0XAwMQg8x96N+17bFmkVCck4oLdL2HO3sDhHFc37HvLpBdFU6nxzSb3MB C8u4hVbUH86p6XhZRKIvFqQRdhMXGHIKMHHGd18Ma5L9UUr7iaAfC8eth8dQOy+fOYsd9A g1/ptH6XWCh8iZVxURS5dJDRIPtmljJux20UNVst2OW5S6jD5BG6BFXG7/sEmUEpQmsfZK yMXwfwsim7WcvLygK93Q0UFkGOBVmQ3idnoFy7eamr2IKE1hEZsIiTpkcUGkew== X-Spam-Score: -3.40 X-Migadu-Queue-Id: 087F5FC8F Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -3.40 X-TUID: 1/TAKnCV9OtH On 2022-11-21 19:09, Kaelyn Takata via Guix-patches via wrote: > * gnu/packages/gl.scm (mesa): Fix library paths in Vulkan layer manifests. > --- > 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 package, you could take the opportunity to modernize/rewrite this package definition using G-Expressions. (Keep the rewrite and this fix in separate commits) > + (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 > > > > >