Subject: [bug#54069] [PATCH 2/2] gnu: pciutils: Unbundle pci.ids and use latest.

From: Brendan Tildesley <[email-masked]>
Date: Sun, 20 Feb 2022 20:55:57 +1100

* gnu/packages/pciutils.scm (pciutils):
[inputs]: Remove zlib. Add hwdata. pci.ids was never gzip'd anyway.
[arguments]: Don't install update-pciids script or it's man page. Don't
install bundled old pci.ids file. Copy pci.ids file from latest hwdata package.
---
 gnu/packages/pciutils.scm | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 416328bda2..3975854f84 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -110,17 +110,28 @@ (define-public pciutils
                (("^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")
+               ;; Don't install update script, its man page, and empty man8 dir.
+               (("update-pciids update-pciids.8 ")
+                "")
+               ((".*update-pciids( |.8).*")
+                "")
+               (("[^ ]*/man8 ")
+                "")
+               ;; Down't install bundled pci.ids file.
+               ((".*INSTALL.*PCI_IDS.*")
+                ""))))
          (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Install the commands, library, and .pc files.
-             (invoke "make" "install" "install-lib")))
+             (invoke "make" "install" "install-lib")
+             ;; Install newer pci.ids file.
+             (copy-file
+              (string-append (assoc-ref inputs "hwdata") "/share/hwdata/pci.ids")
+              (string-append (assoc-ref outputs "out") "/share/hwdata/pci.ids"))))
 
          ,@(if (hurd-target?)
                '((add-after 'unpack 'apply-hurd-patch
@@ -145,7 +156,7 @@ (define-public pciutils
        ,@(if (hurd-target?)
              `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch")))
              '())
-       ("zlib" ,zlib)))
+       ("hwdata" ,hwdata)))
     (home-page "https://mj.ucw.cz/sw/pciutils/")
     (synopsis "Programs for inspecting and manipulating PCI devices")
     (description
-- 
2.34.0