guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: libpotassco: Unbundle catch.


From: guix-commits
Subject: branch master updated: gnu: libpotassco: Unbundle catch.
Date: Sat, 29 Apr 2023 10:30:13 -0400

This is an automated email from the git hooks/post-receive script.

lilyp pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 3676e312aa gnu: libpotassco: Unbundle catch.
3676e312aa is described below

commit 3676e312aaf1ce10ed1d7844e871b54e04624098
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sat Apr 29 10:28:39 2023 +0200

    gnu: libpotassco: Unbundle catch.
    
    This patch incidentally fixes a build failure caused by the bundled catch.
    
    * gnu/packages/potassco.scm (libpotassco)[source]: Unbundle catch.
    [native-inputs]: Add catch2-1.
---
 gnu/packages/potassco.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index 386ff62f0c..6e7855793f 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -51,6 +51,12 @@
                       (url "https://github.com/potassco/libpotassco";)
                       (commit commit)))
                 (file-name (git-file-name name version))
+                (modules '((guix build utils)))
+                (snippet
+                 #~(begin
+                     (delete-file "tests/catch.hpp")
+                     (substitute* (find-files "tests" "\\.cpp")
+                       (("\"catch.hpp\"") "<catch/catch.hpp>"))))
                 (sha256
                  (base32
                   "1c32f9gqclf7qx07lpx8wd720vfhkjqhzc6nyy8mjmgwpmb3iyyn"))))
@@ -72,6 +78,7 @@
                (rename-file "cmake/PotasscoConfig.cmake.in"
                             "cmake/potassco-config.cmake.in"))))))
       (build-system cmake-build-system)
+      (native-inputs (list catch2-1))
       (home-page "https://potassco.org/";)
       (synopsis "Utility library for Potassco's projects")
       (description "@code{libpotassco} is a utility library providing functions



reply via email to

[Prev in Thread] Current Thread [Next in Thread]