From: "Ludovic Courtès" <ludo@gnu.org>
To: "Wiktor Żelazny" <wz@freeshell.de>
Cc: 57337@debbugs.gnu.org
Subject: [bug#57337] [v2 2/2] gnu: Add docxbox.
Date: Wed, 25 Jan 2023 23:21:05 +0100 [thread overview]
Message-ID: <87fsbys1bi.fsf@gnu.org> (raw)
In-Reply-To: <20221226145732.1237-3-wz@freeshell.de> ("Wiktor Żelazny"'s message of "Mon, 26 Dec 2022 15:57:32 +0100")
Wiktor Żelazny <wz@freeshell.de> skribis:
> * gnu/packages/textutils.scm (docxbox): New variable.
[...]
> + (snippet '(begin
> + (for-each delete-file-recursively
> + '("bin" "vendor/json" "vendor/miniz-cpp"
> + "vendor/tinyxml2"))))))
No need for ‘begin’.
> + (build-system cmake-build-system)
> + ;; (native-inputs (list bats)) ; Enable after fixing tests, use bash module
> + (inputs `(("json-modern-cxx" ,json-modern-cxx)
> + ("miniz-cpp" ,miniz-cpp)
> + ("tinyxml2-source" ,(package-source tinyxml2))))
You can write:
(inputs (list json-modern-cxx miniz-cpp))
and…
> + (arguments
> + `(#:phases (modify-phases %standard-phases
> + (add-after 'unpack 'unvendor
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "CMakeLists.txt"
> + (("vendor/miniz-cpp/zip_file.hpp")
> + ""))
> + (with-directory-excursion "docxbox"
> + (substitute* (find-files "." "\\.(cc|h)$")
> + (("#include <vendor/json/single_include/")
> + "#include <"))
> + (substitute* (find-files "." "\\.hpp$")
> + (("#include <vendor/miniz-cpp/")
> + "#include <")))))
> + (add-after 'unpack 'unpack-tinyxml2
> + (lambda* (#:key inputs #:allow-other-keys)
> + (mkdir-p "vendor/tinyxml2")
> + (copy-recursively (assoc-ref inputs "tinyxml2-source")
> + "vendor/tinyxml2")))
… this:
(arguments
(list #:phases
#~(modify-phases …
(copy-recursively #$(package-source tinyxml2) …)
…)))
It would be best if it could depend on TinyXML2 directly, rather than
rebuilding it as part of the build process, but I supposed that’s
trickier so we can leave that for later.
Could you send an updated patch, together with the miniz-cpp one?
Thanks in advance!
Ludo’.
next prev parent reply other threads:[~2023-01-25 22:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 9:27 [bug#57337] [PATCH 0/2] Add docxbox Wiktor Żelazny
2022-08-22 9:36 ` [bug#57337] [PATCH 1/2] gnu: Add miniz-cpp Wiktor Żelazny
2022-08-22 9:36 ` [bug#57337] [PATCH 2/2] gnu: Add docxbox Wiktor Żelazny
2022-09-08 12:49 ` [bug#57337] [PATCH 0/2] " Ludovic Courtès
2022-09-23 18:04 ` Wiktor Żelazny
2022-09-08 12:46 ` Ludovic Courtès
2022-09-23 17:46 ` Wiktor Żelazny
2022-09-08 12:44 ` Ludovic Courtès
2022-09-23 18:21 ` Wiktor Żelazny
2022-12-26 14:57 ` [bug#57337] [v2 " Wiktor Żelazny
2022-12-26 14:57 ` [bug#57337] [v2 1/2] gnu: Add miniz-cpp Wiktor Żelazny
2023-01-25 22:17 ` Ludovic Courtès
2022-12-26 14:57 ` [bug#57337] [v2 2/2] gnu: Add docxbox Wiktor Żelazny
2023-01-25 22:21 ` Ludovic Courtès [this message]
2023-01-28 19:50 ` Wiktor Żelazny
2023-02-05 20:18 ` [bug#57337] [PATCH v3 1/2] gnu: Add miniz-cpp Wiktor Żelazny
2023-02-05 20:18 ` [bug#57337] [PATCH v3 2/2] gnu: Add docxbox Wiktor Żelazny
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=87fsbys1bi.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=57337@debbugs.gnu.org \
--cc=wz@freeshell.de \
/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).