[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
40/40: gnu: blanket: Add 'bash' input for 'wrap-program'.
From: |
guix-commits |
Subject: |
40/40: gnu: blanket: Add 'bash' input for 'wrap-program'. |
Date: |
Sat, 21 Oct 2023 01:53:19 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 90b7c33dbf915cbff4a456ba994398525f1c1919
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:07:10 2021 +0200
gnu: blanket: Add 'bash' input for 'wrap-program'.
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
---
gnu/packages/task-management.scm | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm
index f9221f8483..0c4893256b 100644
--- a/gnu/packages/task-management.scm
+++ b/gnu/packages/task-management.scm
@@ -30,6 +30,7 @@
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
@@ -330,7 +331,7 @@ a task.")
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
- #:tests? #f ;the "Validate appstream file" test fails
+ #:tests? #f ;the "Validate appstream file" test fails
#:phases
(modify-phases %standard-phases
(add-after 'wrap 'wrap-libs
@@ -342,20 +343,20 @@ a task.")
(wrap-program (string-append out "/bin/blanket")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
- `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
- #t)))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path)))))))))
(native-inputs
- `(("desktop-file-utils" ,desktop-file-utils)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk+:bin" ,gtk+ "bin")
- ("pkg-config" ,pkg-config)))
+ (list desktop-file-utils
+ gettext-minimal
+ `(,glib "bin")
+ gobject-introspection
+ `(,gtk+ "bin")
+ pkg-config))
(inputs
(list appstream-glib
+ bash-minimal
gsettings-desktop-schemas
gst-plugins-bad
- gst-plugins-good ;for ScaleTempo plugin
+ gst-plugins-good ;for ScaleTempo plugin
gtk+
libhandy
python
- 28/40: gnu: econnman: Add 'bash' input for 'wrap-program'., (continued)
- 28/40: gnu: econnman: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 29/40: gnu: tomb: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 30/40: gnu: translate-shell: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 36/40: gnu: remmina: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 37/40: gnu: virtualization: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 19/40: gnu: xfce: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 24/40: gnu: emulators: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 27/40: gnu: dirvish: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 38/40: gnu: texlive-biber: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 39/40: gnu: fzf: Add 'bash-minimal' input for 'wrap-program'., guix-commits, 2023/10/21
- 40/40: gnu: blanket: Add 'bash' input for 'wrap-program'.,
guix-commits <=
- 12/40: gnu: remind: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 20/40: gnu: web: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 23/40: gnu: text-editors: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21
- 34/40: gnu: awesome: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/21