From: Tanguy Le Carrour <tanguy@bioneland.org>
To: liliana.prikler@ist.tugraz.at, 54396@debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy@bioneland.org>
Subject: [bug#54396] [PATCH v6] gnu: python-notmuch2: Fix build.
Date: Tue, 22 Mar 2022 17:11:26 +0100 [thread overview]
Message-ID: <20220322161126.30669-1-tanguy@bioneland.org> (raw)
In-Reply-To: <20220315093814.25033-1-tanguy@bioneland.org>
Hi Liliana,
Sorry, but I didn't find time last week-end to migrate the package
definition to the new style! :-(
But, just in case in would make sense to fix the build before I found
some time to do my homework, here is the patch!
Cheers,
--
Tanguy
* gnu/packages/mail.scm (python-notmuch2):
(%standard-phases): Add 'create-notmuch-config' and 'patch-setup.py'
after 'enter-python-dir'.
---
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 d253ca7011..1a11163be6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -28,7 +28,7 @@
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2020, 2021 Tanguy Le Carrour <tanguy@bioneland.org>
+;;; Copyright © 2019, 2020-2022 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
;;; Copyright © 2020 Eric Brown <ecbrown@ericcbrown.com>
@@ -1493,7 +1493,27 @@ (define-public python-notmuch2
;; This python package lives in a subdirectory of the notmuch source
;; tree, so chdir into it before building.
(add-after 'unpack 'enter-python-dir
- (lambda _ (chdir "bindings/python-cffi"))))))
+ (lambda _ (chdir "bindings/python-cffi")))
+ ;; python-build-system does not invoke the configure script
+ ;; so _notmuch_config.py is missing
+ (add-after 'enter-python-dir 'create-notmuch-config
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-output-to-file "_notmuch_config.py"
+ (lambda _
+ (display
+ (string-append
+ "NOTMUCH_INCLUDE_DIR="
+ "'" (dirname (search-input-file inputs "include/notmuch.h")) "'\n"
+ "NOTMUCH_LIB_DIR="
+ "'" (dirname (search-input-file inputs "lib/libnotmuch.so")) "'"))))))
+ ;; version.txt is not included in notmuch, so we patch in the version number
+ (add-after 'create-notmuch-config 'patch-setup.py
+ (lambda _
+ (substitute* "setup.py"
+ (("NOTMUCH_VERSION_FILE")
+ "'/dev/null'")
+ (("version=VERSION,")
+ (string-append "version='" ,(package-version this-package) "',"))))))))
(synopsis "Pythonic bindings for the notmuch mail database using CFFI")
(license license:gpl3+)))
--
2.34.0
next prev parent reply other threads:[~2022-03-22 16:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 9:38 [bug#54396] [PATCH] [WIP] gnu: python-notmuch2: Fix build Tanguy Le Carrour
2022-03-15 10:11 ` Liliana Marie Prikler
2022-03-15 10:58 ` Tanguy LE CARROUR
2022-03-15 16:04 ` Maxime Devos
2022-03-16 7:57 ` Tanguy LE CARROUR
2022-03-16 11:16 ` [bug#54396] [PATCH v2] " Tanguy Le Carrour
2022-03-16 11:28 ` Liliana Marie Prikler
2022-03-16 13:46 ` Tanguy LE CARROUR
2022-03-16 14:02 ` Liliana Marie Prikler
2022-03-16 16:48 ` Tanguy LE CARROUR
2022-03-17 6:59 ` Liliana Marie Prikler
2022-03-17 9:43 ` Tanguy LE CARROUR
2022-03-17 9:51 ` Liliana Marie Prikler
2022-03-17 17:32 ` Tanguy LE CARROUR
2022-03-22 16:11 ` Tanguy Le Carrour [this message]
2022-03-23 20:15 ` bug#54396: [PATCH v6] " Liliana Marie Prikler
2022-03-24 7:11 ` [bug#54396] " Tanguy LE CARROUR
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220322161126.30669-1-tanguy@bioneland.org \
--to=tanguy@bioneland.org \
--cc=54396@debbugs.gnu.org \
--cc=liliana.prikler@ist.tugraz.at \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.