From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AOKBAPzFKWImagEAgWs5BA (envelope-from ) for ; Thu, 10 Mar 2022 10:33:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8EqLOfvFKWJ9agEA9RJhRA (envelope-from ) for ; Thu, 10 Mar 2022 10:33:47 +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 763DB2A9CA for ; Thu, 10 Mar 2022 10:33:47 +0100 (CET) Received: from localhost ([::1]:47702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFAz-0001vp-9c for larch@yhetil.org; Thu, 10 Mar 2022 04:33:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAP-0001If-25 for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAO-0005Q7-PJ for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAO-0002XE-Lk for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 7/7] gnu: libpciaccess: Use hwdata for pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047829702 (code B ref 54069); Thu, 10 Mar 2022 09:33:04 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:33:02 +0000 Received: from localhost ([127.0.0.1]:33210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAI-0002W7-KQ for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:37734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAH-0002Vf-8B for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:57 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KDkPb37pBz9sjC; Thu, 10 Mar 2022 10:32:51 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904769; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=u8Kg3uuPdBugYsQQ5Ljw6DkS1qEYck3mLEl779Nw2yA=; b=nnRqsEhnQQmfB/ktNQ3aZvPrCc1INJgLISiYY+WV76RK9w+bRx6cUzKnJoGPKN4jP4sfo7 em17nRsFAxwwYq9zvK3bTm2BYNunRgKbV+1capxfXjNRzbv/wwuUsNLHdrq9tVXdWnFDJu FZJhPAMVGj+z0rLu2LjB3GRzAqan9eQR8hV3/KrsxicRw0APDozFS52RNdbTE8aeC8zibt mW6O4ZGWyn91O9YT1j82D7wnoH46ZTWF7nl7OLcDyg0i4wPjHHpZBf6Ynn5DAc0esz1Glr F8oDNXj0t13lgrGKXHbHyDXgkpbIfU77WoXJHOXzalsgIEONxXkFztIx8+cXzw== Date: Thu, 10 Mar 2022 20:31:45 +1100 Message-Id: <20220310093145.31649-8-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646904827; 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:dkim-signature; bh=u8Kg3uuPdBugYsQQ5Ljw6DkS1qEYck3mLEl779Nw2yA=; b=PpzpHkESUetFa2N2sOrQAu012mEO0qj0BFvNXgIg7PMVDR+EEowsM3U9aPV8ZCeYLpkJrP MbOtO51XzI+ViyPFcSF4Iflc84aTB1M5+mNx47s/v6tkeusO/xve4Fu0/GjltldB0Hnoyh i9BknJoe3kiJ+QXDgKwA+d2pSRinO8bqDvMwCYDfLFMT73tlqusZZklGs3wkY7bQ79V7b4 yTZ6VHcWbCFvyK1jyNNl6wWAhaMwisXpPTQQbKhN4dqEPFNiovpXnnd6COn26t6KvH11QR x6b/Eg8+/+blKWofEy3v8zbz+CdghfzkH6bMyzE/ZmOJ8VZhJZxIbuhhTv3+sQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646904827; a=rsa-sha256; cv=none; b=BA6WSiXOCeUc4Z5EySuUSrFpWx93zsdszmZsAxreTrC25h4qU59CrgkEVb34gFcUoONtXe Y2yaJt2LtIZhkFUL9mIRBLbcO4fXpjpG4W/PPeFL8A7yXn9+6akDd5GWGSQ/DmwT5ALH+/ xwyPCQPGv0h5f8u8QoPm6p+911u7iZ6E7RO8ikk5y6EMBAPurv1iVqylbdJwobkgs40zWo 09jgS6Qha7RByl46H8CgqbyjHtJg6fFRpvqs5mwLy8aWpp5xjQcajz89BOrD38S9fXsojE bLfJLfAXX6vma5p/LoDv186RxR48GQKlmcdEyjROi6zfHpIYn6JHjbS17O0OXQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=nnRqsEhn; 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-Spam-Score: 1.80 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=nnRqsEhn; 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-Queue-Id: 763DB2A9CA X-Spam-Score: 1.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: w3qzoDkJriMM * gnu/packages/xorg.scm (libpciaccess): [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. [inputs]: Add hwdata:pci, remove zlib, pciutils. [native-inputs]: Remove pkg-config since zlib isn't used. --- gnu/packages/xorg.scm | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14cd3bc789..67ce0c9980 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1150,36 +1151,19 @@ (define-public libpciaccess (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" - (string-append "--with-pciids-path=" - (assoc-ref %build-inputs "pciutils") - "/share/hwdata")) - - #:phases - (modify-phases %standard-phases - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #t)))))) - (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' - (native-inputs - (list pkg-config)) + (list + #:configure-flags + #~(list (string-append + "--with-pciids-path=" + (ungexp (this-package-input "hwdata") "pci") + "/share/hwdata/pci.ids")))) + (inputs (list `(,hwdata "pci"))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.") -- 2.34.0