From: Efraim Flashner <efraim@flashner.co.il>
To: Tanguy Le Carrour <tanguy@bioneland.org>
Cc: 44720@debbugs.gnu.org
Subject: [bug#44720] [PATCH] gnu: astroid: Fix inputs.
Date: Wed, 18 Nov 2020 12:03:06 +0200 [thread overview]
Message-ID: <20201118100306.GA20593@E5400> (raw)
In-Reply-To: <20201118083057.22752-1-tanguy@bioneland.org>
[-- Attachment #1.1: Type: text/plain, Size: 338 bytes --]
Can you try the attached patch? It wraps the binary in GI_TYPELIB_PATH
instead of propagating gsettings-desktop-schemas.
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #1.2: 0001-gnu-astroid-Fix-build.patch --]
[-- Type: text/plain, Size: 2776 bytes --]
From c2ca21180acd1f655b71040bf3266761bb27d2cf Mon Sep 17 00:00:00 2001
From: Tanguy Le Carrour <tanguy@bioneland.org>
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 <efraim@flashner.co.il>
---
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-11-18 10:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 8:30 [bug#44720] [PATCH] gnu: astroid: Fix inputs Tanguy Le Carrour
2020-11-18 10:03 ` Efraim Flashner [this message]
2020-11-18 10:22 ` Tanguy LE CARROUR
2020-11-18 10:50 ` Efraim Flashner
2020-11-18 13:58 ` Tanguy LE CARROUR
2020-11-18 14:15 ` bug#44720: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201118100306.GA20593@E5400 \
--to=efraim@flashner.co.il \
--cc=44720@debbugs.gnu.org \
--cc=tanguy@bioneland.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).