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/patchutils.scm | |
| parent | 40645ebb71eece35b3fc64399dc77140a9a8e8be (diff) | |
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/patchutils.scm')
| -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 4cd6bbbf486..80c454a5c41 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm | |||
| @@ -265,11 +265,17 @@ GiB).") | |||
| 265 | (inputs | 265 | (inputs |
| 266 | `(("python-cairo" ,python-pycairo) | 266 | `(("python-cairo" ,python-pycairo) |
| 267 | ("python-gobject" ,python-pygobject) | 267 | ("python-gobject" ,python-pygobject) |
| 268 | ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) | ||
| 268 | ("gtksourceview" ,gtksourceview-3))) | 269 | ("gtksourceview" ,gtksourceview-3))) |
| 269 | (propagated-inputs | 270 | (propagated-inputs |
| 270 | `(("dconf" ,dconf))) | 271 | `(("dconf" ,dconf))) |
| 271 | (arguments | 272 | (arguments |
| 272 | `(#:phases | 273 | `(#:imported-modules ((guix build glib-or-gtk-build-system) |
| 274 | ,@%python-build-system-modules) | ||
| 275 | #:modules ((guix build python-build-system) | ||
| 276 | ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) | ||
| 277 | (guix build utils)) | ||
| 278 | #:phases | ||
| 273 | (modify-phases %standard-phases | 279 | (modify-phases %standard-phases |
| 274 | ;; This setup.py script does not support one of the Python build | 280 | ;; This setup.py script does not support one of the Python build |
| 275 | ;; system's default flags, "--single-version-externally-managed". | 281 | ;; system's default flags, "--single-version-externally-managed". |
| @@ -293,6 +299,8 @@ GiB).") | |||
| 293 | (invoke "py.test" "-v" "-k" | 299 | (invoke "py.test" "-v" "-k" |
| 294 | ;; TODO: Those tests fail, why? | 300 | ;; TODO: Those tests fail, why? |
| 295 | "not test_classify_change_actions"))) | 301 | "not test_classify_change_actions"))) |
| 302 | (add-after 'wrap 'glib-or-gtk-wrap | ||
| 303 | (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) | ||
| 296 | (add-after 'wrap 'wrap-typelib | 304 | (add-after 'wrap 'wrap-typelib |
| 297 | (lambda* (#:key inputs outputs #:allow-other-keys) | 305 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 298 | (let ((out (assoc-ref outputs "out"))) | 306 | (let ((out (assoc-ref outputs "out"))) |
