[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/145: gnu: pciutils: Fix the conditional for the kmod input.
From: |
guix-commits |
Subject: |
29/145: gnu: pciutils: Fix the conditional for the kmod input. |
Date: |
Mon, 10 Jan 2022 11:44:04 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit 5a351613d1af58b3ad37476b39803f4a817d3fde
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
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?)
- 26/145: gnu: glib: Fix cross-compilation., (continued)
- 26/145: gnu: glib: Fix cross-compilation., guix-commits, 2022/01/10
- 31/145: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 24/145: gnu: libcap: Use #$output unconditionally., guix-commits, 2022/01/10
- 41/145: gnu: gsettings-desktop-schemas: Add python to native inputs., guix-commits, 2022/01/10
- 35/145: gnu: cmake-bootstrap: Update to 3.21.4., guix-commits, 2022/01/10
- 10/145: gnu: Remove meson-0.59 workarounds., guix-commits, 2022/01/10
- 06/145: gnu: python-pyparsing: Update to 3.0.6., guix-commits, 2022/01/10
- 09/145: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., guix-commits, 2022/01/10
- 16/145: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 18/145: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3., guix-commits, 2022/01/10
- 29/145: gnu: pciutils: Fix the conditional for the kmod input.,
guix-commits <=
- 30/145: gnu: glibmm: Remove trailing #t., guix-commits, 2022/01/10
- 32/145: gnu: gnupg: Update to 2.2.32., guix-commits, 2022/01/10
- 20/145: gnu: mozjs-60: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 33/145: gnu: util-linux: Update to 2.37.2., guix-commits, 2022/01/10
- 34/145: gnu: eudev: Update to 3.2.11., guix-commits, 2022/01/10
- 36/145: gnu: libpcap: Update to 2.62., guix-commits, 2022/01/10
- 39/145: gnu: rust-1.39: Update mrustc to commit c70665., guix-commits, 2022/01/10
- 42/145: gnu: python-gnupg: Update to 0.4.8., guix-commits, 2022/01/10
- 02/145: gnu: libx11: Update to 1.7.3.1., guix-commits, 2022/01/10
- 08/145: gnu: python-flit-core: Update to 3.5.1., guix-commits, 2022/01/10