From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 39156@debbugs.gnu.org
Subject: [bug#39156] [PATCH] gnu: nim: Fix substitution in stdlib_osproc.c
Date: Thu, 16 Jan 2020 23:14:41 +0100 [thread overview]
Message-ID: <20200116221441.mu62k4v3u6ekemn4@zdrowyportier.kadziolka.net> (raw)
* gnu/packages/nim.scm (nim)[arguments](patch-more-shebangs): Patch the
string length too.
---
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 5694eae63b..22dac0b58a 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 _
--
2.24.1
next reply other threads:[~2020-01-16 22:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 22:14 Jakub Kądziołka [this message]
2020-01-21 17:53 ` [bug#39156] Test case for the patch Jakub Kądziołka
2020-01-21 20:30 ` bug#39156: [PATCH] gnu: nim: Fix substitution in stdlib_osproc.c Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200116221441.mu62k4v3u6ekemn4@zdrowyportier.kadziolka.net \
--to=kuba@kadziolka.net \
--cc=39156@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.