unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: iyzsong--- via Guix-patches via <guix-patches@gnu.org>
To: 65565@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>
Subject: [bug#65565] [PATCH v2] gnu: chaiscript: Fix tests.
Date: Tue, 29 Aug 2023 18:40:24 +0800	[thread overview]
Message-ID: <e3de824c24e6d856b51eff65932364b769f58c66.1693305601.git.iyzsong@member.fsf.org> (raw)
In-Reply-To: <a0905c2eabff02f1b3e9f32a09a033ffc57c74b6.1693139413.git.iyzsong@member.fsf.org>

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/cpp.scm (chaiscript)[source]: Add snippet.
[inputs]: Add catch2.
---
 gnu/packages/cpp.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3b949198c7..2f8cc2ce25 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -509,8 +509,17 @@ (define-public chaiscript
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))))
+        (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c"))
+       (modules '((guix build utils)))
+       ;; It's bundled catch2 fails to build.
+       (snippet '(begin
+                   (delete-file "unittests/catch.hpp")
+                   (substitute* "unittests/compiled_tests.cpp"
+                     (("catch[.]hpp") "catch2/catch.hpp"))
+                   (substitute* "unittests/type_info_test.cpp"
+                     (("catch[.]hpp") "catch2/catch.hpp"))))))
     (build-system cmake-build-system)
+    (inputs (list catch2))
     (home-page "https://chaiscript.com/")
     (synopsis "Embedded scripting language designed for C++")
     (description

base-commit: 715d203b414727be43e405d09e86aa823125a4b3
-- 
2.41.0





      parent reply	other threads:[~2023-08-29 10:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-27 12:30 [bug#65565] [PATCH] gnu: chaiscript: Fix tests iyzsong--- via Guix-patches via
2023-08-27 15:09 ` Adam Faiz via Guix-patches via
2023-08-29 10:46   ` 宋文武 via Guix-patches via
2023-08-29 10:40 ` iyzsong--- via Guix-patches via [this message]

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=e3de824c24e6d856b51eff65932364b769f58c66.1693305601.git.iyzsong@member.fsf.org \
    --to=guix-patches@gnu.org \
    --cc=65565@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=iyzsong@member.fsf.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).