01/01: gnu: terminator: Wrap instead of propagating GSettings schemas.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 96681d4be101c771fafd4257aca471685119fedd
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Mon Aug 5 22:16:54 2019 +0200

    gnu: terminator: Wrap instead of propagating GSettings schemas.
    
    * gnu/packages/gnome.scm (terminator)[inputs]:
    Move gsettings-desktop-schemas back here…
    [propagated-inputs]: …from here.
    [arguments]: Add the glib-or-gtk-build-system's ‘glib-or-gtk-wrap’
    phase.
---
 gnu/packages/gnome.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3e75cc6..601248b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8153,15 +8153,18 @@ advanced image management tool")
     (inputs
      `(("cairo" ,cairo)
        ("gobject-introspection" ,gobject-introspection)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("python2-pycairo" ,python2-pycairo)
        ("python2-pygobject" ,python2-pygobject)
        ("python2-psutil" ,python2-psutil)
        ("vte" ,vte)))
-    (propagated-inputs
-     ;; Terminator refuses to start when these are not present.
-     `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
     (arguments
-     `(#:python ,python-2                          ;Python 3 not supported
+     `(#:python ,python-2                          ; Python 3 isn't supported
+       #:imported-modules ((guix build glib-or-gtk-build-system)
+                           ,@%python-build-system-modules)
+       #:modules ((guix build python-build-system)
+                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                  (guix build utils))
        #:phases
        (modify-phases %standard-phases
          (add-after
@@ -8172,7 +8175,9 @@ advanced image management tool")
               (wrap-program prog
                 `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
-              #t))))))
+              #t)))
+         (add-after 'wrap-program 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (home-page "https://gnometerminator.blogspot.com/";)
     (synopsis "Store and run multiple GNOME terminals in one window")
     (description