From: Brendan Tildesley <mail@brendan.scot>
To: 54069@debbugs.gnu.org
Cc: John Kehayias <john.kehayias@protonmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids.
Date: Sat, 26 Feb 2022 15:32:38 +1100 [thread overview]
Message-ID: <20220226043238.2657-4-mail@brendan.scot> (raw)
In-Reply-To: <20220226043238.2657-1-mail@brendan.scot>
* 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 | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 14e35d19ae..99ef114e9c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -33,6 +33,7 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
+;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1150,36 +1151,16 @@ (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=" #$hwdata:pci "/share/hwdata"))))
+ (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
next prev parent reply other threads:[~2022-02-26 4:34 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-20 9:53 [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-20 9:55 ` [bug#54069] [PATCH 1/2] gnu: Add hwdata Brendan Tildesley
2022-02-20 9:55 ` [bug#54069] [PATCH 2/2] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-21 19:40 ` [bug#54069] [PATCH 0/2] " Maxim Cournoyer
2022-02-22 8:40 ` Brendan Tildesley
2022-02-24 3:32 ` Maxim Cournoyer
2022-02-25 4:44 ` Brendan Tildesley
2022-02-26 5:00 ` Maxim Cournoyer
2022-02-21 16:19 ` John Kehayias via Guix-patches via
2022-02-22 19:34 ` John Kehayias via Guix-patches via
2022-02-22 21:00 ` Maxim Cournoyer
2022-02-22 21:22 ` John Kehayias via Guix-patches via
2022-02-23 1:08 ` Maxim Cournoyer
2022-02-23 6:16 ` John Kehayias via Guix-patches via
2022-02-26 4:32 ` [bug#54069] [PATCH v2 1/4] gnu: Add hwdata Brendan Tildesley
2022-02-26 4:32 ` [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-26 14:19 ` Maxim Cournoyer
2022-02-26 4:32 ` [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids Brendan Tildesley
2022-02-26 11:21 ` Maxime Devos
2022-02-27 1:37 ` Brendan Tildesley
2022-02-27 10:46 ` Maxime Devos
2022-02-27 10:56 ` Maxime Devos
2022-02-27 21:23 ` Ludovic Courtès
2022-02-27 22:17 ` Maxime Devos
2022-02-28 11:48 ` Ludovic Courtès
2022-02-27 22:18 ` Maxime Devos
2022-02-27 12:12 ` Maxime Devos
2022-02-26 4:32 ` Brendan Tildesley [this message]
2022-02-26 23:14 ` [bug#54069] [PATCH v2 1/4] gnu: Add hwdata Maxim Cournoyer
2022-02-27 12:08 ` Maxime Devos
2022-03-10 9:31 ` [bug#54069] [PATCHES v3 0/7]: Update and make use of hwdata Brendan Tildesley
2022-03-10 9:31 ` [bug#54069] [PATCH v3 1/7] gnu: hwdata: Set #:target #f Brendan Tildesley
2022-03-10 9:31 ` [bug#54069] [PATCH v3 2/7] gnu: hwdata: Remove unused gzip native-input Brendan Tildesley
2022-03-10 9:31 ` [bug#54069] [PATCH v3 3/7] gnu: hwdata: Update to 0.357 Brendan Tildesley
2022-03-10 9:31 ` [bug#54069] [PATCH v3 4/7] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-03-23 1:57 ` [bug#54069] [PATCH 0/2] " Maxim Cournoyer
2022-03-10 9:31 ` [bug#54069] [PATCH v3 5/7] gnu: libosinfo: Unbundle usb.ids, pci.ids Brendan Tildesley
2022-03-23 2:14 ` bug#54069: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Maxim Cournoyer
2022-03-10 9:31 ` [bug#54069] [PATCH v3 6/7] gnu: libosinfo: Use this-package-input Brendan Tildesley
2022-03-10 9:31 ` [bug#54069] [PATCH v3 7/7] gnu: libpciaccess: Use hwdata for pci.ids Brendan Tildesley
2022-03-22 22:02 ` [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220226043238.2657-4-mail@brendan.scot \
--to=mail@brendan.scot \
--cc=54069@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.