guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

23/52: gnu: heimdal: Fix inputs when cross-compiling.


From: guix-commits
Subject: 23/52: gnu: heimdal: Fix inputs when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:33 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit de8ea8e827573b3b83e2b495073ce75692b30f85
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 22:15:31 2021 +0200

    gnu: heimdal: Fix inputs when cross-compiling.
    
    * 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 01fea23..6f3491a 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; 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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]