me/guix
Archived
1
0
Fork 0
Code Activity

gnu: freedesktop: Add 'bash' input for 'wrap-program'

Browse source 
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>
This commit is contained in:
Maxime Devos 2022-08-02 14:13:27 +02:00 • committed by Mathieu Othacehe
parent 74fbbb1661
commit 607f9a9af9
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/freedesktop.scm
View file

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