apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 5a351613d1af58b3ad37476b39803f4a817d3fde
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Dec 17 22:50:12 2021 -0500
gnu: pciutils: Fix the conditional for the kmod input.
Fixes <https://issues.guix.gnu.org/52411>. Thanks to Maxime Devos for
suggesting the solution.
* gnu/packages/pciutils.scm (pciutils): Delete trailing #t.
[inputs]{kmod}: Use the hurd-target? procedure in the condition, which
correctly handles the Nix system of %current-system and GNU triplet of
%current-target-system.
---
gnu/packages/pciutils.scm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 47275a8ff0..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.
@@ -111,9 +110,7 @@
(native-inputs
(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?)
