branch master updated: gnu: astroid: Fix build.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4c9eed9  gnu: astroid: Fix build.
4c9eed9 is described below

commit 4c9eed9c5640ac5807630394c3b48fe331077c0b
Author: Tanguy Le Carrour <tanguy@bioneland.org>
AuthorDate: Wed Nov 18 09:30:57 2020 +0100

    gnu: astroid: Fix build.
    
    * gnu/packages/mail.scm (astroid)[arguments]: Add phase to wrap binary
    in GI_TYPELIB_PATH. Add 'glib-or-gtk-compile-schemas and
    'glib-or-gtk-wrap phases from the glib-or-gtk build system.
    [propagated-inputs]: Add adwaita-icon-theme.
    
    Co-authored with Efraim Flashner <efraim@flashner.co.il>
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/mail.scm | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 59f49d1..1e2dd40 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -729,7 +729,13 @@ mailpack.  What can alterMIME do?
            #t))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags (list "-GNinja")
+     `(#:modules ((guix build cmake-build-system)
+                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                  (guix build utils)
+                  (ice-9 match))
+       #:imported-modules ((guix build glib-or-gtk-build-system)
+                           ,@%cmake-build-system-modules)
+       #:configure-flags (list "-GNinja")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-markdown-test
@@ -759,7 +765,26 @@ mailpack.  What can alterMIME do?
              #t))
          (replace 'install
            (lambda _
-             (invoke "ninja" "install"))))))
+             (invoke "ninja" "install")))
+         (add-after 'install 'wrap-with-GI_TYPELIB_PATH
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (paths (map (match-lambda
+                                 ((outputs . directory)
+                                  (let ((girepodir (string-append
+                                                    directory
+                                                    "/lib/girepository-1.0")))
+                                    (if (file-exists? girepodir)
+                                        girepodir
+                                        #f))))
+                               inputs)))
+               (wrap-program (string-append out "/bin/astroid")
+                 `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths))))
+             #t))
+         (add-after 'install 'glib-or-gtk-compile-schemas
+           (assoc-ref glib-or-gtk:%standard-phases 
'glib-or-gtk-compile-schemas))
+         (add-after 'install 'glib-or-gtk-wrap
+           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (native-inputs
      `(("glib-networking" ,glib-networking)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
@@ -781,6 +806,8 @@ mailpack.  What can alterMIME do?
        ("python" ,python-wrapper)
        ("python-pygobject" ,python-pygobject)
        ("webkitgtk" ,webkitgtk)))
+    (propagated-inputs
+     `(("adwaita-icon-theme" ,adwaita-icon-theme))) ; Required for the thread 
view
     (home-page "https://astroidmail.github.io/";)
     (synopsis "GTK frontend to the notmuch mail system")
     (description