[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/19: gnu: m4: Fix cross-compilation.
From: |
guix-commits |
Subject: |
01/19: gnu: m4: Fix cross-compilation. |
Date: |
Sun, 26 Jun 2022 17:24:46 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1ae2a47a0129059c6cd35e28683077999c320540
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 26 20:28:46 2022 +0200
gnu: m4: Fix cross-compilation.
* gnu/packages/m4.scm (m4)[arguments]: Look up /bin/sh in NATIVE-INPUTS if
applicable.
---
gnu/packages/m4.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm
index 9d3dbe41f2..fbc075a2cb 100644
--- a/gnu/packages/m4.scm
+++ b/gnu/packages/m4.scm
@@ -55,8 +55,9 @@
(("4 5 6")
"4 6"))))
(add-after 'unpack 'configure-shell
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((/bin/sh (search-input-file inputs "/bin/sh")))
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let ((/bin/sh (search-input-file (or native-inputs inputs)
+ "/bin/sh")))
;; Adjust hard-coded /bin/sh for tests.
(substitute* "lib/config.hin"
(("\"/bin/sh\"")
- 15/19: gnu: libbsd: Update to 0.11.6., (continued)
- 15/19: gnu: libbsd: Update to 0.11.6., guix-commits, 2022/06/26
- 05/19: gnu: gawk: Update to 5.1.1., guix-commits, 2022/06/26
- 08/19: gnu: readline: Remove input labels., guix-commits, 2022/06/26
- 11/19: gnu: bison: Update to 3.8.2., guix-commits, 2022/06/26
- 06/19: gnu: gawk: Use G-expressions and remove labels., guix-commits, 2022/06/26
- 16/19: gnu: GnuTLS: Update to 3.7.6., guix-commits, 2022/06/26
- 19/19: gnu: Tcl/Tk: Update to 8.6.12., guix-commits, 2022/06/26
- 09/19: gnu: util-linux: Update to 2.37.4., guix-commits, 2022/06/26
- 18/19: gnu: libgpg-error: Remove input label., guix-commits, 2022/06/26
- 02/19: gnu: Remove guile@3.0.7., guix-commits, 2022/06/26
- 01/19: gnu: m4: Fix cross-compilation.,
guix-commits <=
- 10/19: gnu: util-linux: Use G-expressions., guix-commits, 2022/06/26
- 17/19: gnu: Remove p11-kit@0.23.22., guix-commits, 2022/06/26