summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-03 09:20:50 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-03 23:24:01 +0200
commit8b43df2b3022e808bdc664e86abc712073849520 (patch)
treecc5abbbeb5997f0cc90644ba4954b1e56a4e88a6
parent21cc905ac20c1e9dec4610f92b3d2202f2e9dcb2 (diff)
downloadguix-8b43df2b3022e808bdc664e86abc712073849520.tar.gz
build-system/glib-or-gtk: Wrap libexec programs.
* guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): Also
  wrap binaries in libexec/, such as those launched by dbus services.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/build/glib-or-gtk-build-system.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm
index c57bc3e731..40f1bb85fa 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -140,7 +140,9 @@ add a dependency of that output on GLib and GTK+."
      ((output . directory)
       (unless (member output glib-or-gtk-wrap-excluded-outputs)
         (let* ((bindir       (string-append directory "/bin"))
-               (bin-list     (find-files bindir ".*"))
+               (libexecdir   (string-append directory "/libexec"))
+               (bin-list     (append (find-files bindir ".*")
+                                     (find-files libexecdir ".*")))
                (datadirs     (data-directories
                               (alist-cons output directory inputs)))
                (gtk-mod-dirs (gtk-module-directories