From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: [PATCH 11/11] gnu: guile-2.0: support mingw. Date: Sun, 8 May 2016 22:42:49 +0200 Message-ID: <1462740169-15029-12-git-send-email-janneke@gnu.org> References: <1462740169-15029-1-git-send-email-janneke@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azVXw-0004yW-Jt for guix-devel@gnu.org; Sun, 08 May 2016 16:43:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azVXj-0008MY-VI for guix-devel@gnu.org; Sun, 08 May 2016 16:43:23 -0400 In-Reply-To: <1462740169-15029-1-git-send-email-janneke@gnu.org> 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: guix-devel@gnu.org * 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)) '()))) (inputs `(("libffi" ,libffi) ("readline" ,readline) - ("bash" ,bash))) - + ,@(libiconv-if-needed) + ,@(if (mingw-target?) '() `(("bash" ,bash))))) (propagated-inputs `( ;; These ones aren't normally needed here, but since `libguile-2.0.la' ;; reads `-lltdl -lunistring', adding them here will add the needed @@ -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"))))) %standard-phases))) (native-search-paths -- 2.7.3