ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 15:22:18 -05: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
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/pciutils.scm
View file

@ -93,6 +93,11 @@ (define-public pciutils
(arguments
`(#: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
(lambda* (#:key outputs #:allow-other-keys)
;; There's no 'configure' script, just a raw makefile.
@ -115,22 +120,29 @@ (define-public pciutils
(string-append "PREFIX := " (assoc-ref outputs "out")
"\n"))
(("^MANDIR:=.*$")
;; By default the thing tries to automatically
;; determine whether to use $prefix/man or
;; $prefix/share/man, and wrongly so.
;; By default the thing tries to automatically
;; determine whether to use $prefix/man or
;; $prefix/share/man, and wrongly so.
(string-append "MANDIR := " (assoc-ref outputs "out")
"/share/man\n"))
(("^SHARED=.*$")
;; Build libpciutils.so.
"SHARED := yes\n")
(("^ZLIB=.*$")
;; Ask for zlib support, for 'pci.ids.gz' decompression.
"ZLIB := yes\n")
(("^IDSDIR=.*$")
;; 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
(lambda* (#:key outputs #:allow-other-keys)
;; Install the commands, library, and .pc files.
@ -151,7 +163,7 @@ (define-public pciutils
;; No test suite.
#:tests? #f))
(native-inputs
(list which pkg-config))
(list `(,hwdata "pci") pkg-config which))
(inputs
`(,@(if (not (hurd-target?))
`(("kmod" ,kmod))