From patchwork Sun Oct 30 05:41:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 44194 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 3A05027BBE9; Sun, 30 Oct 2022 05:43:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 906A527BBEA for ; Sun, 30 Oct 2022 05:43:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1op168-0001AW-BA; Sun, 30 Oct 2022 01:43: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 1op166-0001A4-BD for guix-patches@gnu.org; Sun, 30 Oct 2022 01:43: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 1op166-000547-19 for guix-patches@gnu.org; Sun, 30 Oct 2022 01:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1op165-0006Lt-Lu for guix-patches@gnu.org; Sun, 30 Oct 2022 01:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58887] [PATCH][staging] gnu: vulkan-loader: Add native-search-paths field. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Oct 2022 05:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58887@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166710856824396 (code B ref -1); Sun, 30 Oct 2022 05:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Oct 2022 05:42:48 +0000 Received: from localhost ([127.0.0.1]:37046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1op15s-0006LP-7G for submit@debbugs.gnu.org; Sun, 30 Oct 2022 01:42:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:55416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1op15q-0006LH-0A for submit@debbugs.gnu.org; Sun, 30 Oct 2022 01:42:46 -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 1op15p-00019a-Lc for guix-patches@gnu.org; Sun, 30 Oct 2022 01:42:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1op15n-00050f-Qs for guix-patches@gnu.org; Sun, 30 Oct 2022 01:42:45 -0400 Date: Sun, 30 Oct 2022 13:41:38 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1667108561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H7vfmIXsDWpqK5LroM0dIOxy9X7ddMQiizCHtyRfMZI=; b=Y+v7486wHkaB9BXdr2SerTwPNRzHHo6XM7HINGoPdichA1VzzxR+aw/HXERz1l4CUS/E1g Jl8xSxo8Ipe4gKrrpDncpl8fsTtrCoqECw/QDw7e4K5sI8kjNhJLf8faiL+RKOm3bPScL/ sgKLX2xv/W/r3/9TwFAI4qVKyX6WsIp7uDGj8REzotNE6dJA8/W1Y7Tj3iAGzJngzEnvEJ aIjKCjstcY/UzI+A5JvJYWCTJtVMFLun0KXBuBAGlPLb1uNoeYTnfTcSqRj8vc7uC1iW4e yF9GSWxXlKTEHZzTmyhvluhDG5qCzHHwA8TEwRc2/frzb1tLmhVZbd1PkLugnA== Message-ID: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=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: , Sender: "Guix-patches" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vulkan.scm (vulkan-loader): Add native-search-paths field. [source]: Change ICD and implicit layers looking up behaviour via snippet. --- gnu/packages/vulkan.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) base-commit: 63bf06013820aa26aca7dc8f18cb79403b94e9a5 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f5c619a2b2..1371860583 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -215,6 +215,22 @@ (define-public vulkan-loader (url "https://github.com/KhronosGroup/Vulkan-Loader") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(substitute* "loader/loader.c" + ;; v1.3.207- + (("VK_ICD_FILENAMES_ENV_VAR, NULL") + "\"VK_ICD_PATH\", override_paths") + (("false, NULL, NULL") + "false, \"VK_ILAYER_PATH\", override_paths") + ;; v1.3.207+ + (("VK_ICD_FILENAMES_ENV_VAR") + "\"VK_ICD_PATH\"") + (("relative_location = VK_ILAYERS_INFO_RELATIVE_DIR;" all) + (string-append "override_env = loader_secure_getenv" + "(\"VK_ILAYER_PATH\", inst);" all)) + (("\\(IMPLICIT_LAYER, \\)NULL" m) + (string-append m "override_paths")))) (sha256 (base32 "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv")))) @@ -251,6 +267,13 @@ (define-public vulkan-loader ("wayland" ,wayland))) (inputs (list vulkan-headers)) + (native-search-paths + (list (search-path-specification + (variable "VK_ICD_PATH") + (files '("share/vulkan/icd.d"))) + (search-path-specification + (variable "VK_ILAYER_PATH") + (files '("share/vulkan/implicit_layer.d"))))) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan")