build-system/glib-or-gtk: Allow specific outputs to be excluded from wrapping.
* guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): Add #:glib-or-gtk-wrap-excluded-outputs parameter and honor it. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Add #:glib-or-gtk-wrap-excluded-outputs parameter and pass it in BUILDER. * doc/guix.texi (Build Systems): Mention it.
This commit is contained in:
parent
c8b7569558
commit
73aa8ddb75
|
@ -1808,6 +1808,13 @@ modules}. This is achieved by wrapping the programs in launch scripts
|
||||||
that appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH}
|
that appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH}
|
||||||
environment variables.
|
environment variables.
|
||||||
|
|
||||||
|
It is possible to exclude specific package outputs from that wrapping
|
||||||
|
process by listing their names in the
|
||||||
|
@code{#:glib-or-gtk-wrap-excluded-outputs} parameter. This is useful
|
||||||
|
when an output is known not to contain any GLib or GTK+ binaries, and
|
||||||
|
where wrapping would gratuitously add a dependency of that output on
|
||||||
|
GLib and GTK+.
|
||||||
|
|
||||||
@item glib-or-gtk-compile-schemas
|
@item glib-or-gtk-compile-schemas
|
||||||
The phase @code{glib-or-gtk-compile-schemas} makes sure that all GLib's
|
The phase @code{glib-or-gtk-compile-schemas} makes sure that all GLib's
|
||||||
@uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html,
|
@uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html,
|
||||||
|
|
|
@ -122,6 +122,7 @@
|
||||||
"bin" "sbin"))
|
"bin" "sbin"))
|
||||||
(phases '(@ (guix build glib-or-gtk-build-system)
|
(phases '(@ (guix build glib-or-gtk-build-system)
|
||||||
%standard-phases))
|
%standard-phases))
|
||||||
|
(glib-or-gtk-wrap-excluded-outputs '())
|
||||||
(system (%current-system))
|
(system (%current-system))
|
||||||
(imported-modules %default-imported-modules)
|
(imported-modules %default-imported-modules)
|
||||||
(modules %default-modules)
|
(modules %default-modules)
|
||||||
|
@ -153,6 +154,8 @@
|
||||||
#:search-paths ',(map search-path-specification->sexp
|
#:search-paths ',(map search-path-specification->sexp
|
||||||
search-paths)
|
search-paths)
|
||||||
#:phases ,phases
|
#:phases ,phases
|
||||||
|
#:glib-or-gtk-wrap-excluded-outputs
|
||||||
|
,glib-or-gtk-wrap-excluded-outputs
|
||||||
#:configure-flags ,configure-flags
|
#:configure-flags ,configure-flags
|
||||||
#:make-flags ,make-flags
|
#:make-flags ,make-flags
|
||||||
#:out-of-source? ,out-of-source?
|
#:out-of-source? ,out-of-source?
|
||||||
|
|
|
@ -79,13 +79,21 @@ a list with all found directories."
|
||||||
|
|
||||||
(fold glib-schemas '() inputs))
|
(fold glib-schemas '() inputs))
|
||||||
|
|
||||||
(define* (wrap-all-programs #:key inputs outputs #:allow-other-keys)
|
(define* (wrap-all-programs #:key inputs outputs
|
||||||
|
(glib-or-gtk-wrap-excluded-outputs '())
|
||||||
|
#:allow-other-keys)
|
||||||
"Implement phase \"glib-or-gtk-wrap\": look for GSettings schemas and
|
"Implement phase \"glib-or-gtk-wrap\": look for GSettings schemas and
|
||||||
gtk+-v.0 libraries and create wrappers with suitably set environment variables
|
gtk+-v.0 libraries and create wrappers with suitably set environment variables
|
||||||
if found."
|
if found.
|
||||||
|
|
||||||
|
Wrapping is not applied to outputs whose name is listed in
|
||||||
|
GLIB-OR-GTK-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not
|
||||||
|
to contain any GLib or GTK+ binaries, and where wrapping would gratuitously
|
||||||
|
add a dependency of that output on GLib and GTK+."
|
||||||
(define handle-output
|
(define handle-output
|
||||||
(match-lambda
|
(match-lambda
|
||||||
((output . directory)
|
((output . directory)
|
||||||
|
(unless (member output glib-or-gtk-wrap-excluded-outputs)
|
||||||
(let* ((bindir (string-append directory "/bin"))
|
(let* ((bindir (string-append directory "/bin"))
|
||||||
(bin-list (find-files bindir ".*"))
|
(bin-list (find-files bindir ".*"))
|
||||||
(schemas (schemas-directories
|
(schemas (schemas-directories
|
||||||
|
@ -109,7 +117,7 @@ if found."
|
||||||
bin-list))
|
bin-list))
|
||||||
(gtk-mod-env-var
|
(gtk-mod-env-var
|
||||||
(for-each (cut wrap-program <> gtk-mod-env-var)
|
(for-each (cut wrap-program <> gtk-mod-env-var)
|
||||||
bin-list)))))))
|
bin-list))))))))
|
||||||
|
|
||||||
(for-each handle-output outputs)
|
(for-each handle-output outputs)
|
||||||
#t)
|
#t)
|
||||||
|
|
Loading…
Reference in New Issue