diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-10-27 18:49:53 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-10-27 18:57:25 +0100 |
| commit | 3a428dd63af0bec23861a8ed1c76665e8f424265 (patch) | |
| tree | 4f313e87601a57cb72a30b08e04d366de150d2ca /gnu/packages | |
| parent | 40645ebb71eece35b3fc64399dc77140a9a8e8be (diff) | |
| download | guix-3a428dd63af0bec23861a8ed1c76665e8f424265.tar.gz | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patchutils.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 4cd6bbbf48..80c454a5c4 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"))) |