From b901a56615deebfb8fffe5b13286abc6da91dee2 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 25 Oct 2019 11:17:26 +0200 Subject: gnu: meld: Fix startup. * /gnu/packages/patchutils.scm: (meld)[inputs]: Replace gtksourceview with gtksourceview-3. [arguments]<#:phases>[wrap-typelib]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/patchutils.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/patchutils.scm') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index a63d889cff..4cd6bbbf48 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -265,7 +265,7 @@ (define-public meld (inputs `(("python-cairo" ,python-pycairo) ("python-gobject" ,python-pygobject) - ("gtksourceview" ,gtksourceview))) + ("gtksourceview" ,gtksourceview-3))) (propagated-inputs `(("dconf" ,dconf))) (arguments @@ -292,7 +292,14 @@ (define-public meld (setenv "HOME" "/tmp") (invoke "py.test" "-v" "-k" ;; TODO: Those tests fail, why? - "not test_classify_change_actions")))))) + "not test_classify_change_actions"))) + (add-after 'wrap 'wrap-typelib + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/meld") + `("GI_TYPELIB_PATH" prefix + ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH")))) + #t)))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at -- cgit v1.2.3