Mathieu Lirzin <m...@openmailbox.org> skribis: > * guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): > Factorize it.
[...] > + (define (env-var var dirs) > + "Associate an environment variable VAR with a list of directory DIRS." > + (and (not (null? dirs)) (list var ":" 'prefix dirs))) s/env-var/wrapper-specification/ or something like that > + (let ((bindir (string-append directory "/bin")) > + (libexecdir (string-append directory "/libexec")) > + (data-var (env-var "XDG_DATA_DIRS" > + (data-directories > + (alist-cons output directory inputs)))) > + (gtk-var (env-var "GTK_PATH" > + (gtk-module-directories > + (alist-cons output directory inputs)))) > + (gio-var (env-var "GIO_EXTRA_MODULES" > + (gio-module-directories > + (alist-cons output directory inputs))))) > + (for-each (cute apply wrap-program <> > + (filter-map identity > + (list data-var gtk-var gio-var))) s/filter-map/filter/ And maybe ‘->bool’ instead of ‘identity’ for clarity. Could you check on a concrete example like Evince that the set of variables and values in the wrapper remains unchanged with this commit? If it’s OK, then OK to commit, but after ‘core-updates’ has been merge (hopefully soonish.) Thank you! Ludo’.
