From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43305) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isDPr-000121-8u for guix-patches@gnu.org; Thu, 16 Jan 2020 17:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isDPq-0004m8-7x for guix-patches@gnu.org; Thu, 16 Jan 2020 17:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60758) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isDPq-0004m4-4y for guix-patches@gnu.org; Thu, 16 Jan 2020 17:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isDPq-0001Ur-01 for guix-patches@gnu.org; Thu, 16 Jan 2020 17:15:02 -0500 Subject: [bug#39156] [PATCH] gnu: nim: Fix substitution in stdlib_osproc.c Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:43268) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isDPi-0000re-7Y for guix-patches@gnu.org; Thu, 16 Jan 2020 17:14:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isDPf-0004aG-JP for guix-patches@gnu.org; Thu, 16 Jan 2020 17:14:54 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:42132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1isDPf-0004TA-98 for guix-patches@gnu.org; Thu, 16 Jan 2020 17:14:51 -0500 Date: Thu, 16 Jan 2020 23:14:41 +0100 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200116221441.mu62k4v3u6ekemn4@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39156@debbugs.gnu.org * 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