02/04: gnu: freedesktop: Add 'bash' input for 'wrap-program'

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit 607f9a9af9e09d2ede24510ca169247785ba25dc
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 2 14:13:27 2022 +0200

    gnu: freedesktop: Add 'bash' input for 'wrap-program'
    
    It is required for cross-compilation.
    Cherry-picked from <https://issues.guix.gnu.org/49327#6>.
    
    * gnu/packages/freedesktop.scm
    (udisks)[inputs]: Add 'bash-minimal' when cross-compiling.
    (perl-file-mimeinfo)[inputs]: Likewise.
    (udiskie)[inputs]: Likewise.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index cde7156383..8816ef5542 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1319,13 +1319,17 @@ Analysis and Reporting Technology) functionality.")
     (propagated-inputs
      (list glib)) ; required by udisks2.pc
     (inputs
-     (list acl
-           cryptsetup
-           libatasmart
-           libblockdev
-           libgudev
-           polkit
-           util-linux))
+     `(,acl
+       ;; TODO(staging): Make unconditional.
+       ,@(if (%current-target-system)
+             (list bash-minimal) ; for wrap-program
+             '())
+       ,cryptsetup
+       ,libatasmart
+       ,libblockdev
+       ,libgudev
+       ,polkit
+       ,util-linux))
     (outputs '("out"
                "doc"))                            ;5 MiB of gtk-doc HTML
     (arguments
@@ -1932,6 +1936,11 @@ applications define in those files.")
         (base32
          "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"))))
     (build-system perl-build-system)
+    (inputs
+     ;; TODO(staging): Make unconditional.
+     (if (%current-target-system)
+         (list bash-minimal) ; for wrap-program
+         '()))
     ;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and
     ;; perl-test-tiny as native-inputs.
     (propagated-inputs
@@ -2028,7 +2037,15 @@ Python, that binds to the C library @code{uchardet} to 
increase performance.")
        ("gettext" ,gettext-minimal)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     (list gobject-introspection gtk+ libappindicator libnotify udisks))
+     ;; TODO(staging): Make unconditional.
+     `(,@(if (%current-target-system)
+             (list bash-minimal)
+             '())
+       ,gobject-introspection
+       ,gtk+
+       ,libappindicator
+       ,libnotify
+       ,udisks))
     (propagated-inputs
      (list python-docopt python-pygobject python-keyutils python-pyxdg
            python-pyyaml))