From patchwork Fri Sep 6 15:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67667 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 E440227BBEA; Fri, 6 Sep 2024 16:08:25 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 A6BAB27BBE2 for ; Fri, 6 Sep 2024 16:08:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZC-0007IF-Gb; Fri, 06 Sep 2024 11:08:08 -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 1smaZ9-00078I-Pp for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08: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 1smaZ9-0003St-H2 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=RUMqlnaKCQQgSYOcxrzFHuN1UOoQY03zpD+SyZMv4wk=; b=ZfYQC2/n7OwJbLVliQKUFkpkqcqzk4bRR2bxpKsW4QVbI637O4N329br9UtbPNgeEdgDy+19hsTmtDzV8qGGPIlpsr1JIiUnepBoU0QubxBa5lz4lgJd+rLjwJYZMk6SzlMoDyZu+Cn9p4F1WD7hvA6+zYZG1oNUKOlHL3lg+oN0oKd4hRkXAeesVeRfwf0m9yJo1opBtI2t4/IkTrLtX6EQ7oN05/XFL8zPeoCrjJtrODJp4F5Pp6O125g2LxUaOGKqcCjWye3y/pxqlhAmlAJsxlaY8BS3iUwVXl1E91muyJoTlnhCyCP5LhpqTMRCCMB6aQBgIaVXD/6BmBQxXA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ9-00053s-0H for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 5/8] gnu: volk: Hard-code path of vulkan-loader for dynamic loading Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , nathan , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563526219398 (code B ref 73071); Fri, 06 Sep 2024 15:08:02 +0000 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:42 +0000 Received: from localhost ([127.0.0.1]:53816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYo-00052n-2S for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:42 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:58007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYm-00052U-B1 for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635254; x=1725894454; bh=RUMqlnaKCQQgSYOcxrzFHuN1UOoQY03zpD+SyZMv4wk=; 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=YwhwNQNLp+SSrEPPsrlx0SKSeak+Nnt6HKUqqrSoGSTkaEkqKVrDjCdojokFmFOdd cSpoXO1QCpPoJoPo+BS5PTCxSO1hPnHbqYEZhksaaO3H2mcgt7OwBxColL2BlQiWI3 dfeL63+5T8KC84yjIBRdIvA6yK0aAd2yYtpWQl2o+hcRdgBRwdTfsfOD79iXMwDRSD 4RXLNjTbLov8tYmmszqBWmMT5aaik2kC0BVtebGiF6+jrsSboA7c2OxIpWF3PFgGOp 3PrX+/fQ3+f2RzuSFaQD3bYKbGT9VJ0qiyYTiSUiHROYXlUMOXiSKMUo3UNh4qL8T1 RkhIgc1Itmr7w== Date: Fri, 06 Sep 2024 15:07:31 +0000 Message-ID: <92b1626bd63250dd639bcb8d9d3be2e3def22a73.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 980bde94717c1908484dc841ebbc405afebad793 MIME-Version: 1.0 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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 From: nathan Until now, we’d get: $ guix shell vulkan-tools -- vulkaninfo ERROR at /tmp/guix-build-vulkan-tools-1.3.280.0.drv-0/source/vulkaninfo/./vulkaninfo.h:412: Failed to initialize: Vulkan loader is not installed, not found, or failed to load. This patch fixes it and potentially for other programs as well. * gnu/packages/vulkan.scm (volk)[arguments]: use gexp. <#:phases>: Patch dlopen with libvulkan.so. [input]: Add vulkan-loader. Change-Id: I5ef0eb13d35e517b8947faddace641882a775b80 Co-authored-by: Ludovic Courtès Signed-off-by: John Kehayias --- gnu/packages/vulkan.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 2.45.2 diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index e76455a835..dd5b51c7fe 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -654,9 +654,19 @@ (define-public volk "0x4jhc8n9c4k8svmmcaxxs613xbsav7wam94gacddlm738cwp13v")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;no test - #:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON"))) - (inputs (list vulkan-headers)) + (list + #:tests? #f ;no test + #:configure-flags #~(list "-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-loader-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "volk.c" + (("dlopen\\(\"libvulkan.so") + (string-append "dlopen(\"" + (search-input-file + inputs "/lib/libvulkan.so"))))))))) + (inputs (list vulkan-headers vulkan-loader)) (synopsis "Meta loader for Vulkan API") (description "Volk is a meta-loader for Vulkan. It allows you to dynamically load