guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: meld: Fix startup.


From: guix-commits
Subject: 01/01: gnu: meld: Fix startup.
Date: Sun, 27 Oct 2019 05:51:15 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit b901a56615deebfb8fffe5b13286abc6da91dee2
Author: Leo Prikler <address@hidden>
Date:   Fri Oct 25 11:17:26 2019 +0200

    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 <address@hidden>
---
 gnu/packages/patchutils.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index a63d889..4cd6bbb 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -265,7 +265,7 @@ GiB).")
     (inputs
      `(("python-cairo" ,python-pycairo)
        ("python-gobject" ,python-pygobject)
-       ("gtksourceview" ,gtksourceview)))
+       ("gtksourceview" ,gtksourceview-3)))
     (propagated-inputs
      `(("dconf" ,dconf)))
     (arguments
@@ -292,7 +292,14 @@ GiB).")
              (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]