guix-commits
[Top][All Lists]
Advanced

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

branch core-updates-frozen updated: gnu: help2man: Resurrect cross-build


From: guix-commits
Subject: branch core-updates-frozen updated: gnu: help2man: Resurrect cross-building.
Date: Sun, 21 Nov 2021 14:36:20 -0500

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new f33a977  gnu: help2man: Resurrect cross-building.
f33a977 is described below

commit f33a977706eb2f6dbbce8a515a4f4963a0f0579d
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Nov 21 13:25:22 2021 +0100

    gnu: help2man: Resurrect cross-building.
    
    This is a follow-up to commit
        378df42fc5ed85260cd9d4c666b67f29baf11f48
        gnu: help2man: Add optional dependencies.
    
    It resurrects the cross-building of all build dependencies for guix, e.g., 
for
    creating a childhurd with a Guix development environment.
    
    * gnu/packages/man.scm (help2man)[inputs]: Do not use perl-gettext when
    cross-building; perl-gettext cannot be cross-built.
---
 gnu/packages/man.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index ca4d325..47c5ae1 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -336,7 +337,9 @@ Linux kernel and C library interfaces employed by 
user-space programs.")
                        #t)))))
     (inputs
      `(("perl" ,perl)
-       ("perl-gettext" ,perl-gettext)))
+       ,@(if (%current-target-system)
+             '()
+             `(("perl-gettext" ,perl-gettext)))))
     (native-inputs
      `(("perl" ,perl)
        ("gettext" ,gettext-minimal)))



reply via email to

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