GNU bug report logs - #56882
[PATCH 0/4] build-system/perl: Support some cross-compilation, and test with xdg-utils

Previous Next

Full log

View this message in rfc822 format

From: Maxime Devos <maximedevos <at> telenet.be>
To: 56882 <at> debbugs.gnu.org
Cc: Maxime Devos <maximedevos <at> telenet.be>
Subject: [bug#56882] [PATCH 2/4] gnu: freedesktop: Add 'bash' input for 'wrap-program'
Date: Tue,  2 Aug 2022 14:13:27 +0200

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.
---
 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 4d06235771..577b354f66 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1319,13 +1319,17 @@ (define-public udisks
     (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
@@ -1930,6 +1934,11 @@ (define-public perl-file-mimeinfo
         (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
@@ -2026,7 +2035,15 @@ (define-public udiskie
        ("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))
-- 
2.37.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.