amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: pciutils: Use newer pci.ids file from hwdata.

Browse source 
* gnu/packages/pciutils.scm (pciutils)[phases]{unbundle-pci.ids}: New phase.
[configure]: Adjust Makefile to not install the update script and its man page.
[native-inputs]{hwdata:pci}: New native input.

Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Brendan Tildesley 2022-03-10 20:31:42 +11:00 • committed by Maxim Cournoyer
parent dbc5b51cb9
commit 387a9772c2
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/pciutils.scm
View file

@ -93,6 +93,11 @@ Each database is contained in a specific package output, such as the
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unbundle-pci.ids
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(copy-file (search-input-file (or native-inputs inputs)
"share/hwdata/pci.ids")
"pci.ids")))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; There's no 'configure' script, just a raw makefile. ;; There's no 'configure' script, just a raw makefile.
@ -124,13 +129,20 @@ Each database is contained in a specific package output, such as the
(("^SHARED=.*$") (("^SHARED=.*$")
;; Build libpciutils.so. ;; Build libpciutils.so.
"SHARED := yes\n") "SHARED := yes\n")
(("^ZLIB=.*$") (("^ZLIB=.*$")
;; Ask for zlib support, for 'pci.ids.gz' decompression. ;; Ask for zlib support, for 'pci.ids.gz' decompression.
"ZLIB := yes\n") "ZLIB := yes\n")
(("^IDSDIR=.*$") (("^IDSDIR=.*$")
;; Installation directory of 'pci.ids.gz'. ;; Installation directory of 'pci.ids.gz'.
"IDSDIR = $(SHAREDIR)/hwdata\n")))) "IDSDIR = $(SHAREDIR)/hwdata\n")
;; Do not install the update script nor its man page.
((".*INSTALL.*update-pciids .*") "")
(("update-pciids update-pciids.8 ") "")
(("(.*INSTALL.*)update-pciids.8(.*)" _ head tail)
(string-append head tail)))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install the commands, library, and .pc files. ;; Install the commands, library, and .pc files.
@ -151,7 +163,7 @@ Each database is contained in a specific package output, such as the
;; No test suite. ;; No test suite.
#:tests? #f)) #:tests? #f))
(native-inputs (native-inputs
(list which pkg-config)) (list `(,hwdata "pci") pkg-config which))
(inputs (inputs
`(,@(if (not (hurd-target?)) `(,@(if (not (hurd-target?))
`(("kmod" ,kmod)) `(("kmod" ,kmod))