From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: Re: [PATCH 11/11] gnu: guile-2.0: support mingw. Date: Mon, 09 May 2016 09:48:38 +0200 Message-ID: <87inyn1xk9.fsf@igalia.com> References: <1462740169-15029-1-git-send-email-janneke@gnu.org> <1462740169-15029-12-git-send-email-janneke@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azfvs-0006Ho-KQ for guix-devel@gnu.org; Mon, 09 May 2016 03:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azfvm-0002f0-Mm for guix-devel@gnu.org; Mon, 09 May 2016 03:48:47 -0400 In-Reply-To: <1462740169-15029-12-git-send-email-janneke@gnu.org> (Jan Nieuwenhuizen's message of "Sun, 8 May 2016 22:42:49 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Jan Nieuwenhuizen Cc: guix-devel@gnu.org On Sun 08 May 2016 22:42, Jan Nieuwenhuizen writes: > * gnu/packages/guile.scm (guile-2.0): Support mingw. > --- > gnu/packages/guile.scm | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm > index 53ea3e5..3fd9ded 100644 > --- a/gnu/packages/guile.scm > +++ b/gnu/packages/guile.scm > @@ -135,11 +135,12 @@ without requiring the source code to be rewritten.") > "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f")) > (patches (search-patches "guile-arm-fixes.patch")))) > (build-system gnu-build-system) > - (native-inputs `(("pkgconfig" ,pkg-config))) > + (native-inputs `(("pkgconfig" ,pkg-config) > + ,@(if (mingw-target?) `(("bash" ,bash)) '()))) AFAIU we can remove the "bash" thing here, as we decided to punt on (ice-9 popen); sound right to you? > @@ -168,7 +169,9 @@ without requiring the source code to be rewritten.") > (let ((bash (assoc-ref inputs "bash"))) > (substitute* "module/ice-9/popen.scm" > (("/bin/sh") > - (string-append bash "/bin/bash"))))) > + (if bash > + (string-append bash "/bin/bash") > + "bash"))))) Needs a comment here explaining that although we should always have bash as an input, it isn't packaged yet on mingw so we are falling back to finding it in the run-time path if needed. FWIW although Windows doesn't support `fork', `open-process' should work in Windows, and we should therefore be able to get (ice-9 popen) working in Windows eventually. Andy