From patchwork Wed Aug 25 18:03:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32269 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D5B5827BBE3; Wed, 25 Aug 2021 19:05:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE78E27BBE1 for ; Wed, 25 Aug 2021 19:05:26 +0100 (BST) Received: from localhost ([::1]:59636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxHC-0002Gz-1P for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxG0-00085z-Qo for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFz-0000vA-R2 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFz-0002pO-MG for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 23/52] gnu: heimdal: Fix inputs when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991464410730 (code B ref 50201); Wed, 25 Aug 2021 18:04:11 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:04 +0000 Received: from localhost ([127.0.0.1]:47712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFr-0002ml-Mf for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:04 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFa-0002hb-I6 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3l8r; Wed, 25 Aug 2021 20:03:45 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:03 +0200 Message-Id: <20210825180332.5720-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914625; bh=XGpdI6/F98kPTmRqM8RxLbZw63qoH6vZ5s+Y3s81QDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RoFi6Kpd16ILL2UosfGgFxu4VTQq2fsrb/0QsWS/XtrQ5jjzIIAS9rRKijuy5VFu7 vYvZD1nGHCwr537c7Vi8XQW/oFY3WZ4Cbcc3XHEzDii6lINtLtc9NXVUwtbHaTHniQ zqik/NiAmnXHK+FGVGiqa9jbLNVsszSnJGzduYzb6+dEMDfCAssjQnaUX/UDQMz67y /lLw+h1xsAJV977FGbt77YW863j+2BKGKRBmJxgawMjqUWvmHjrFy7yUwD0njmBPcW qt4SgtlnXFNCW8OlgSZnVrlrE12EhP38JAdUTXCZAtPm3mCeFU1BAtFS1DxdYM0DyS igJBb9K8hhPXw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kerberos.scm (heimdal)[inputs]: Add "bash-minimal" when cross-compiling. (heimdal)[native-inputs]: Add 'perl' when cross-compiling. --- gnu/packages/kerberos.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 01fea23ec1..6f3491acf6 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (define-module (gnu packages kerberos) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages dbm) #:use-module (gnu packages perl) @@ -244,8 +246,15 @@ After installation, the system administrator should generate keys using #:parallel-tests? #f)) (native-inputs `(("e2fsprogs" ,e2fsprogs) ;for 'compile_et' ("texinfo" ,texinfo) - ("unzip" ,unzip))) ;for tests + ("unzip" ,unzip) ;for tests + ,@(if (%current-target-system) + `(("perl" ,perl)) + '()))) (inputs `(("readline" ,readline) + ;; TODO(core-updates): Make this input unconditional. + ,@(if (%current-target-system) + `(("bash-minimal" ,bash-minimal)) + '()) ("bdb" ,bdb) ("e2fsprogs" ,e2fsprogs) ;for libcom_err ("sqlite" ,sqlite)))