01/01: gnu: meld: Wrap with Glib or Gtk path variables.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 3a428dd63af0bec23861a8ed1c76665e8f424265
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Oct 27 18:49:53 2019 +0100

    gnu: meld: Wrap with Glib or Gtk path variables.
    
    Fixes the example given at <https://issues.guix.gnu.org/issue/37942>.
    
    * gnu/packages/gnome.scm (meld)[inputs]: Add gsettings-desktop-schemas.
    [arguments]: Add (guix build glib-or-gtk-build-system) to #:modules
    and #:imported-modules.  Use its ‘glib-or-gtk-wrap’ phase.
---
 gnu/packages/patchutils.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index 4cd6bbb..80c454a 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -265,11 +265,17 @@ GiB).")
     (inputs
      `(("python-cairo" ,python-pycairo)
        ("python-gobject" ,python-pygobject)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtksourceview" ,gtksourceview-3)))
     (propagated-inputs
      `(("dconf" ,dconf)))
     (arguments
-     `(#:phases
+     `(#: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
          ;; This setup.py script does not support one of the Python build
          ;; system's default flags, "--single-version-externally-managed".
@@ -293,6 +299,8 @@ GiB).")
              (invoke "py.test" "-v" "-k"
                      ;; TODO: Those tests fail, why?
                      "not test_classify_change_actions")))
+         (add-after 'wrap 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
          (add-after 'wrap 'wrap-typelib
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))