diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/pciutils.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/pciutils.scm')
| -rw-r--r-- | gnu/packages/pciutils.scm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d7d224b292..b6b1e3ad85 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -87,8 +87,7 @@ (("^IDSDIR=.*$") ;; Installation directory of 'pci.ids.gz'. - "IDSDIR = $(SHAREDIR)/hwdata\n")) - #t)) + "IDSDIR = $(SHAREDIR)/hwdata\n")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -109,12 +108,9 @@ ;; No test suite. #:tests? #f)) (native-inputs - `(("which" ,which) - ("pkg-config" ,pkg-config))) + (list which pkg-config)) (inputs - `(,@(if (member (or (%current-target-system) - (%current-system)) - (package-supported-systems kmod)) + `(,@(if (not (hurd-target?)) `(("kmod" ,kmod)) '()) ,@(if (hurd-target?) |