diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:15:49 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:15:49 +0200 |
commit | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (patch) | |
tree | b3d6aa01aec86a7f224e15d97a40b64de4e5cdb8 /gnu/packages/pciutils.scm | |
parent | c20cd0d24d9b5e8a47b864db9799e0992ffd44b9 (diff) | |
parent | 2f837cf7fe100b0584fb02cf8f19d4cfb4e14d88 (diff) | |
download | guix-72e2815d18ad688b0a16ce3b3efba1172423cec4.tar guix-72e2815d18ad688b0a16ce3b3efba1172423cec4.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/pciutils.scm')
-rw-r--r-- | gnu/packages/pciutils.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index a3d85e8386..e428aaedb0 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. @@ -56,12 +56,18 @@ ;; $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. - "ZLIB := yes\n")))) + ;; Ask for zlib support, for 'pci.ids.gz' decompression. + "ZLIB := yes\n") + + (("^IDSDIR=.*$") + ;; Installation directory of 'pci.ids.gz'. + "IDSDIR = $(SHAREDIR)/hwdata\n")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -85,5 +91,6 @@ "The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices, all based on a common portable library libpci which offers access to the PCI configuration space on a variety -of operating systems. This includes the 'lspci' and 'setpci' commands.") +of operating systems. This includes the @command{lspci} and @command{setpci} +commands.") (license license:gpl2+))) |