[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: n2n: Fix cross-compilation.
From: |
guix-commits |
Subject: |
branch master updated: gnu: n2n: Fix cross-compilation. |
Date: |
Tue, 22 Feb 2022 13:53:45 -0500 |
This is an automated email from the git hooks/post-receive script.
ngz pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 346a686369 gnu: n2n: Fix cross-compilation.
346a686369 is described below
commit 346a686369552edbd399b7baa7680b3970c33d84
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Tue Feb 22 19:50:51 2022 +0100
gnu: n2n: Fix cross-compilation.
* gnu/packages/vpn.scm (n2n)[arguments]<#:phases>: Add (or native-inputs
inputs) to SEARCH-INPUT-FILE.
---
gnu/packages/vpn.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 2c0b2f15c9..5bf5a62481 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -319,13 +319,14 @@ endpoints.")
#~(modify-phases %standard-phases
(add-before 'bootstrap 'move-configure
;; Don't execute configure script in bootstrap.
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda _
(substitute* "autogen.sh"
(("./configure") ""))))
(add-before 'configure 'fix-configure
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
(substitute* "configure"
- (("/bin/sh") (search-input-file inputs "/bin/sh"))))))
+ (("/bin/sh")
+ (search-input-file (or native-inputs inputs) "/bin/sh"))))))
#:tests? #f)) ;there is no check target
(native-inputs
(list autoconf automake bash-minimal pkg-config))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: n2n: Fix cross-compilation.,
guix-commits <=