From patchwork Tue Aug 8 18:08:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 52681 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 BD65A27BBEA; Tue, 8 Aug 2023 19:10:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9ABA927BBE9 for ; Tue, 8 Aug 2023 19:10:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTR9o-0005C4-P5; Tue, 08 Aug 2023 14:10:12 -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 1qTR9e-0005Al-QY for guix-patches@gnu.org; Tue, 08 Aug 2023 14:10:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTR9e-0003r5-IU for guix-patches@gnu.org; Tue, 08 Aug 2023 14:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qTR9e-0008Ay-2a for guix-patches@gnu.org; Tue, 08 Aug 2023 14:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65155] [PATCH] gnu: mesa: Add native-search-paths. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Aug 2023 18:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65155 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65155@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169151815031364 (code B ref -1); Tue, 08 Aug 2023 18:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Aug 2023 18:09:10 +0000 Received: from localhost ([127.0.0.1]:37750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTR8o-00089n-6T for submit@debbugs.gnu.org; Tue, 08 Aug 2023 14:09:10 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTR8l-00089b-SG for submit@debbugs.gnu.org; Tue, 08 Aug 2023 14:09:09 -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 1qTR8g-0004oH-Fi for guix-patches@gnu.org; Tue, 08 Aug 2023 14:09:02 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTR8e-0003ad-IT for guix-patches@gnu.org; Tue, 08 Aug 2023 14:09:02 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 88A275C0085 for ; Tue, 8 Aug 2023 14:08:58 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 08 Aug 2023 14:08:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm1; t=1691518138; x=1691604538; bh=gA uIjpJp/Qlao6ix71VyWHxSYueDrKgdvxQLNpeqWj0=; b=bHjLcv0vIuyy//CVQt yhXVKVtl9p8nxbit35x+F06p5iLDdZpRf26JPRWTlMLpcjTP2I3KhOedyKFyheaY B12Jb42pDsdHRfdX2ZSGBLcgRkZAJWD6v3s0LqP9bNwxOltTgmkFigqwyzir5esO qmxoxBorUynuwTnVtxsfvfIW3VU5msxbpsSCD3XGiqnFsv0vNp7nzvG8lmV7y+DO Z7Rp7TKul6mo28eBcv0xrmMe7jvZS1YT7xnrxNtDnRiAgVlXOV5A0QkWz5SOVMr5 UK8VnFVWuxPPmfxpL5sKkaQNHfmyBEuJ3AchV0iYkz5CRjqEUX8YiuJwhWtEYlHp zVkw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1691518138; x=1691604538; bh=gAuIjpJp/Qlao 6ix71VyWHxSYueDrKgdvxQLNpeqWj0=; b=x4b3nLJe2zoCLg8o/dLUMjcBzFr4B ViEB9eclGt7PwDtc03EisXNooXmSACIYXp2U1xk62i8O3bKE1ZZAq5jw4Ek0qPOP KwgTDTvy8VjO7Tf1ZfFiOGPSBIu/pCRumhPkcG/AxjlQHILgoxVqLyZfrIsmCrgR +hDrrcIBFqvtpCfXy4mI6EodkIn/ZH5lMA0izOhUcc43NgKPYdHu320XTVINwGeT r4EdoYxGhC7bZFxPrIay+W0DuX9uD2mHnvr22v4PbIzjfYQ/L9es1afvCm/3xACG TXWwmVF+d5MVXkRKo2nlOuc68kEIuAJjrazfT0Euyo40ZYyFV6T09MZew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrledvgdduvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepgefhueehteevkeeihffggeefudehhfeujefhteefvddvieeigefhudekkeekhf elnecuffhomhgrihhnpehluhhnrghrghdrtghomhdpmhgvshgrfegurdhorhhgnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrgh grmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 8 Aug 2023 14:08:57 -0400 (EDT) From: dan Date: Wed, 9 Aug 2023 02:08:49 +0800 Message-ID: <20230808180851.32652-1-i@dan.games> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.26; envelope-from=i@dan.games; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: , 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) [native-search-paths]: Export XDG_DATA_DIRS. According to https://vulkan.lunarg.com/doc/view/1.3.231.1/linux/loader_and_layer_interface.html, Vulkan loader search for manifest files in several directories. Some of them are in the $HOME directory, some of them are set during compile-time. We don't raelly want vulkan-loader to depend on mesa during compile-time, since we couldn't assume that mesa is the only package providing Vulkan drivers. Thus, it's better for us to export XDG_DATA_DIRS in mesa, so that when both packages are installed, Vulkan loader could find the corresponding Vulkan drivers by environment varaible. --- gnu/packages/gl.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) base-commit: 4547bc6fa3142dca77f7fc912368aeff31bd6e53 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b53b42a9ba..583cd5a945 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2021, 2022, 2023 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Kaelyn Takata +;;; Copyright © 2023 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -518,7 +519,11 @@ (define-public mesa ;; Ensure the Mesa VDPAU drivers can be found. (variable "VDPAU_DRIVER_PATH") (separator #f) - (files '("lib/vdpau"))))) + (files '("lib/vdpau"))) + (search-path-specification + ;; Ensure the Vulkan drivers can be found by Vulkan loader. + (variable "XDG_DATA_DIRS") + (files '("share"))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") (description "Mesa is a free implementation of the OpenGL and Vulkan