From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 8CvtLWnRnmUWcgAAkFu2QA (envelope-from ) for ; Wed, 10 Jan 2024 18:18:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YAC0J2nRnmXwHAAAqHPOHw (envelope-from ) for ; Wed, 10 Jan 2024 18:18:33 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704907113; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=/maVyqq5FKpc9Fcqy9bw5RolThL2qOKhTRU9D4+Svss=; b=E/LUbCc6IY0SfLBcZ+ygpmgBZnH/hUnCXAfTiONK+0uoMbyEfLY7WJgYGickOvYdhlUSRf XD/yXqs9WBEpptzqaNsXkRtFEpMzW4GY1Mlorsj/7NN5yAnwEl18HGxfTuWrLxRpDwxf/Y pZPnECsjqz51Ojxsw5eq0FmhCM/hIppcfeK9WrBVRr3XR8pwr3emZLBdBn3itkZi3UsykH xW+JMyJ2CAi8+4sLZBgaukWkTP/Y6k/avRe81DXEdUxfxzIPgFScd+45FUmC50ZrPpGTRx Fsj9Xebk84qQej6Wla789hiuSUgc9cDGd/0ajVctRc+0ZeR6IpPvmpPIBdab7g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704907113; a=rsa-sha256; cv=none; b=f57jBXqsCrZM0rjZc54cv4PcLd6FTwLgSa89PwnsV0U72HfZKMpSZHnPeIiBoNgvBIqqF8 erTMqd6jHXzzzPcwMF76dtIyNsZUsUxqGr/WX+BAZK9+4AJV+YXnwEieOukJJfhueoiPsV PRGhsscds/GsRCvqZ44shWgN1Y1oztPTbA5mcoX7H43ct2UE15Ne3/jIM65UU160XSLDZ8 W0bmgPBGR2sNHVUYXg5A32eKqtD13W3Ss8aL/2HIro5ukfk2yK4di3MXqTAA9tPlLKoLqR 1E2JC5xAu7nW1QyMdyNi8mqgrnbwdQLfNdY/Z5Jf4CDO3Pk4XU9OjecEzUufnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none 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 80B9C11373 for ; Wed, 10 Jan 2024 18:18:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNcDO-0000wM-3K; Wed, 10 Jan 2024 12:18: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 1rNcDM-0000vk-5Q for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:04 -0500 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 1rNcDL-00048j-RM for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNcDK-0004m8-1n for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68263] [PATCH v2 2/2] gnu: fwupd: Depend on libsmbios only on supported systems. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68263@debbugs.gnu.org Cc: Vagrant Cascadian , Mathieu Othacehe , Efraim Flashner Received: via spool by 68263-submit@debbugs.gnu.org id=B68263.170490703518274 (code B ref 68263); Wed, 10 Jan 2024 17:18:02 +0000 Received: (at 68263) by debbugs.gnu.org; 10 Jan 2024 17:17:15 +0000 Received: from localhost ([127.0.0.1]:42699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNcCZ-0004kf-BK for submit@debbugs.gnu.org; Wed, 10 Jan 2024 12:17:15 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNcCX-0004kL-Sr for 68263@debbugs.gnu.org; Wed, 10 Jan 2024 12:17:14 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 941FB659E6; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CQ7jssYZQwl4; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 158C6659E2; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) From: Simon South Date: Wed, 10 Jan 2024 12:16:55 -0500 Message-ID: <2ee10a7ee9f4a6b2eea6cfa85e1d613538b33c8e.1704906299.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.99 X-Spam-Score: -4.99 X-Migadu-Queue-Id: 80B9C11373 X-Migadu-Scanner: mx11.migadu.com X-TUID: w5xyqHz4UdAc * gnu/packages/firmware.scm (fwupd)[inputs]: Add libsmbios conditionally. Change-Id: Id34135b180f5ee6e7abd2fd4eb10e0d3c6308e06 --- gnu/packages/firmware.scm | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e691bf33da..75294fadf4 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -31,6 +31,7 @@ (define-module (gnu packages firmware) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) #:use-module (guix packages) + #:use-module (guix platform) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) @@ -283,21 +284,27 @@ (define-public fwupd `(,glib "bin") help2man gettext-minimal)) - (inputs (list bash-completion - libgudev - libxmlb - sqlite - polkit - eudev - libelf - tpm2-tss - cairo - efivar - pango - protobuf-c - mingw-w64-tools - libsmbios - gnu-efi)) + (inputs (append + (list bash-completion + libgudev + libxmlb + sqlite + polkit + eudev + libelf + tpm2-tss + cairo + efivar + pango + protobuf-c + mingw-w64-tools + gnu-efi) + (if (supported-package? libsmbios + (or (and=> (%current-target-system) + platform-target->system) + (%current-system))) + (list libsmbios) + '()))) ;; In Requires of fwupd*.pc. (propagated-inputs (list curl gcab -- 2.41.0