[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: nim: Fix /bin/sh substitution in C code.
From: |
guix-commits |
Subject: |
branch master updated: gnu: nim: Fix /bin/sh substitution in C code. |
Date: |
Tue, 21 Jan 2020 15:27:08 -0500 |
This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 79e074e gnu: nim: Fix /bin/sh substitution in C code.
79e074e is described below
commit 79e074ea10875ff75ca613179c70de12d64b19f5
Author: Jakub Kądziołka <address@hidden>
AuthorDate: Thu Jan 16 23:14:41 2020 +0100
gnu: nim: Fix /bin/sh substitution in C code.
* gnu/packages/nim.scm (nim)[arguments]: Patch the string length too.
Signed-off-by: Tobias Geerinckx-Rice <address@hidden>
---
gnu/packages/nim.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm
index 5694eae..22dac0b 100644
--- a/gnu/packages/nim.scm
+++ b/gnu/packages/nim.scm
@@ -50,10 +50,12 @@
#t)))
(add-after 'patch-source-shebangs 'patch-more-shebangs
(lambda _
- (substitute* (append '("tests/stdlib/tosprocterminate.nim"
- "lib/pure/osproc.nim")
- (find-files "c_code" "stdlib_osproc.c"))
- (("/bin/sh") (which "sh")))
+ (let ((sh (which "sh")))
+ (substitute* '("tests/stdlib/tosprocterminate.nim"
+ "lib/pure/osproc.nim")
+ (("/bin/sh") sh))
+ (substitute* (find-files "c_code" "stdlib_osproc.c")
+ (("\"/bin/sh\", 7") (format "~s, ~s" sh (string-length
sh)))))
#t))
(replace 'build
(lambda _
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: nim: Fix /bin/sh substitution in C code.,
guix-commits <=