diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2017-07-10 10:53:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-10 10:55:20 +0200 |
| commit | ab2a8cac58595461012de39cea64296d91978f3f (patch) | |
| tree | 279e524f73dbd87fc50718f06301d6f92459048c /gnu/packages/xorg.scm | |
| parent | a48da398b3ee279c54db7ea70b3c3195acf5c94b (diff) | |
| download | guix-ab2a8cac58595461012de39cea64296d91978f3f.tar guix-ab2a8cac58595461012de39cea64296d91978f3f.tar.gz | |
gnu: libpciaccess: Refer to 'pci.ids' from pciutils.
Prior to this change libpciaccess would try to read from
/usr/share/hwdata/pci.ids.
* gnu/packages/xorg.scm (libpciaccess)[arguments]: New field.
[inputs]: Add PCIUTILS.
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 278410f4ce..555f12fbeb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pciutils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -1112,8 +1113,29 @@ themselves.") (base32 "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m")))) (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 - `(("zlib" ,zlib))) + `(("zlib" ,zlib) + ("pciutils" ,pciutils))) ;for 'pci.ids.gz' (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") |