[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids.
From: |
Brendan Tildesley |
Subject: |
[bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids. |
Date: |
Sat, 26 Feb 2022 15:32:38 +1100 |
* 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
- [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest., (continued)
[bug#54069] [PATCH v2 1/4] gnu: Add hwdata., Brendan Tildesley, 2022/02/25
- [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest., Brendan Tildesley, 2022/02/25
- [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids.,
Brendan Tildesley <=
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Brendan Tildesley, 2022/02/25
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Maxime Devos, 2022/02/26
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Brendan Tildesley, 2022/02/26
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Maxime Devos, 2022/02/27
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Maxime Devos, 2022/02/27
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Ludovic Courtès, 2022/02/27
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Maxime Devos, 2022/02/27
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Ludovic Courtès, 2022/02/28
- [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Maxime Devos, 2022/02/27
[bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids., Maxime Devos, 2022/02/27