From c2ca21180acd1f655b71040bf3266761bb27d2cf Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 18 Nov 2020 09:30:57 +0100 Subject: [PATCH] gnu: astroid: Fix build. * gnu/packages/mail.scm (astroid)[arguments]: Add phase to wrap binary in GI_TYPELIB_PATH. [propagated-inputs]: Add adwaita-icon-theme. Signed-off-by: Efraim Flashner --- gnu/packages/mail.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 59f49d1247..741130eab6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -729,7 +729,10 @@ mailpack. What can alterMIME do? #t)))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-GNinja") + `(#:modules ((guix build cmake-build-system) + (guix build utils) + (ice-9 match)) + #:configure-flags (list "-GNinja") #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-markdown-test @@ -759,7 +762,22 @@ 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))))) (native-inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) @@ -781,6 +799,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 -- 2.29.2