ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: blanket: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/task-management.scm
(blanket): Delete trailing #t.
[native-inputs]: Remove labels.
[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I8d3458d16fd4ead7735b3e4b12b8bd0a12459fb0
This commit is contained in:
Maxime Devos 2021-07-02 12:07:10 +02:00 committed by Ludovic Courtès
parent 9baa93b818
commit 177228ccae
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/task-management.scm
View file

@ -31,6 +31,7 @@ (define-module (gnu packages task-management)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bash)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
@ -334,7 +335,7 @@ (define-public blanket
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
#:tests? #f ;the "Validate appstream file" test fails #:tests? #f ;the "Validate appstream file" test fails
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'wrap 'wrap-libs (add-after 'wrap 'wrap-libs
@ -346,20 +347,20 @@ (define-public blanket
(wrap-program (string-append out "/bin/blanket") (wrap-program (string-append out "/bin/blanket")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
`("GUIX_PYTHONPATH" ":" prefix (,python-path)))) `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
#t)))))
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) (list desktop-file-utils
("gettext" ,gettext-minimal) gettext-minimal
("glib:bin" ,glib "bin") `(,glib "bin")
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk+:bin" ,gtk+ "bin") `(,gtk+ "bin")
("pkg-config" ,pkg-config))) pkg-config))
(inputs (inputs
(list appstream-glib (list appstream-glib
bash-minimal
gsettings-desktop-schemas gsettings-desktop-schemas
gst-plugins-bad gst-plugins-bad
gst-plugins-good ;for ScaleTempo plugin gst-plugins-good ;for ScaleTempo plugin
gtk+ gtk+
libhandy libhandy
python python