diff options
Diffstat (limited to 'gnu/packages/serialization.scm')
| -rw-r--r-- | gnu/packages/serialization.scm | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3f0a550920..df9e8fd7a9 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -39,6 +39,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages autotools) @@ -160,7 +161,7 @@ implement RPC protocols.") (mkdir-p doc) (copy-recursively "doc/html" doc))))))) (native-inputs - (list doxygen)) + (list doxygen gcc-10)) (home-page "https://uscilab.github.io/cereal/") (synopsis "C++11 library for serialization") (description @@ -194,17 +195,26 @@ such as compact binary encodings, XML, or JSON.") (file-name (git-file-name "cereal" version)) (sha256 (base32 - "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) + "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")) + (snippet + '(delete-file "unittests/doctest.h")))) (arguments (substitute-keyword-arguments (package-arguments cereal) ((#:configure-flags flags #~'()) - #~'("-DSKIP_PORTABILITY_TEST=ON")) + #~'("-DSKIP_PORTABILITY_TEST=ON" "-DWITH_WERROR=OFF")) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases + (add-after 'unpack 'update-doctest + (lambda* (#:key inputs #:allow-other-keys) + (install-file (search-input-file inputs "unittests/doctest.h") + "unittests/"))) (add-before 'configure 'skip-sandbox (lambda _ (substitute* "CMakeLists.txt" - (("add_subdirectory\\(sandbox\\)") "")))))))))) + (("add_subdirectory\\(sandbox\\)") "")))))))) + (native-inputs + (list doxygen gcc-10 + (package-source cereal))))) (define-public msgpack (package @@ -452,26 +462,16 @@ in which the loaded data is arranged in memory.") (define-public jsoncpp (package (name "jsoncpp") - (version "1.9.4") + (version "1.9.5") (home-page "https://github.com/open-source-parsers/jsoncpp") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) - (patches - (search-patches "jsoncpp-pkg-config-version.patch")) (sha256 (base32 - "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES" - ,@(if (%current-target-system) - `("-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF") - '())) - ,@(if (%current-target-system) - '() - `(#:cmake ,cmake-bootstrap)))) + "06zss7z56ykzwcsfdxarmini63hkf8i8gx70q3yw9wb0bw7wj9rv")))) + (build-system meson-build-system) (synopsis "C++ library for interacting with JSON") (description "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also @@ -494,7 +494,14 @@ it a convenient format to store user input files.") (file-name (git-file-name name version)) (sha256 (base32 - "1180ln8blrb0mwzpcf78k49hlki6di65q77rsvglf83kfcyh4d7z")))))) + "1180ln8blrb0mwzpcf78k49hlki6di65q77rsvglf83kfcyh4d7z")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~'("-DBUILD_SHARED_LIBS:BOOL=YES" + #$@(if (%current-target-system) + #~("-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF") + #~())))))) (define-public json.sh (let ((commit "0d5e5c77365f63809bf6e77ef44a1f34b0e05840") ;no releases |