From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH] gnu: openssl: Fix cross-compile issues. Date: Sun, 15 Dec 2013 09:03:37 +0100 Message-ID: <1387094617-5048-1-git-send-email-jmd@gnu.org> References: <87haabtadh.fsf@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vs6gF-0007tu-5B for guix-devel@gnu.org; Sun, 15 Dec 2013 03:04:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vs6g9-0004hq-1o for guix-devel@gnu.org; Sun, 15 Dec 2013 03:04:03 -0500 In-Reply-To: <87haabtadh.fsf@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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: John Darrington * gnu/packages/openssl.scm (openssl): Move perl from inputs to native-inputs. Replace reference to target bash with the native bash or target bash as appropriate. --- gnu/packages/openssl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm index ca72aa8..438e76f 100644 --- a/gnu/packages/openssl.scm +++ b/gnu/packages/openssl.scm @@ -35,7 +35,7 @@ (sha256 (base32 "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia")))) (build-system gnu-build-system) - (inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl))) (arguments '(#:parallel-build? #f #:parallel-tests? #f @@ -52,8 +52,8 @@ (string-append "--prefix=" out))))) (alist-cons-before 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) (substitute* (find-files "test" ".*") (("/bin/sh") (string-append bash "/bin/bash")) -- 1.7.10.4