amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Tobias Geerinckx-Rice 2019-10-27 18:49:53 +01:00
parent 40645ebb71
commit 3a428dd63a
No known key found for this signature in database
GPG key ID: D889B0F018C5493C
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/patchutils.scm
View file

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