From: Maxime Devos <maximedevos@telenet.be>
To: 56882@debbugs.gnu.org
Cc: Maxime Devos <maximedevos@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 [thread overview]
Message-ID: <20220802121329.22276-2-maximedevos@telenet.be> (raw)
In-Reply-To: <20220802121329.22276-1-maximedevos@telenet.be>
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
next prev parent reply other threads:[~2022-08-02 12:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-02 11:54 [bug#56882] [PATCH 0/4] build-system/perl: Support some cross-compilation, and test with xdg-utils Maxime Devos
2022-08-02 12:13 ` [bug#56882] [PATCH 1/4] build-system/perl: Support cross-compilation of some Perl packages Maxime Devos
2022-08-02 12:13 ` Maxime Devos [this message]
2022-08-02 12:13 ` [bug#56882] [PATCH 3/4] perl-file-mimeinfo: Fix cross-compilation Maxime Devos
2022-08-02 12:13 ` [bug#56882] [PATCH 4/4] xdg-utils: Support cross-compilation Maxime Devos
2022-08-06 16:25 ` bug#56882: [PATCH 0/4] build-system/perl: Support some cross-compilation, and test with xdg-utils Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220802121329.22276-2-maximedevos@telenet.be \
--to=maximedevos@telenet.be \
--cc=56882@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).