Unverified Commit 607f9a9a authored by Maxime Devos's avatar Maxime Devos Committed by Mathieu Othacehe
Browse files

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: default avatarMathieu Othacehe <othacehe@gnu.org>
parent 74fbbb16
......@@ -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
......@@ -1932,6 +1936,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
......@@ -2028,7 +2037,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))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment