diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-21 15:31:14 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-21 22:41:44 +0100 |
| commit | d9580a26c7ad9638fee4282c24db8f48ec8f6fec (patch) | |
| tree | 065ac8df56150cddc28f6451a03ad32577ea403f | |
| parent | 813fa6e2c91f3d9ad3a83fcc0e99a19488898618 (diff) | |
gnu: jsoncpp: Update to 1.9.2.
* gnu/packages/serialization.scm (jsoncpp): Update to 1.9.2.
* gnu/packages/games.scm (minetest)[source](snippet): Add substitution.
| -rw-r--r-- | gnu/packages/games.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/serialization.scm | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a072564d46..3d825cbe61 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1890,7 +1890,15 @@ match, cannon keep, and grave-itation pit.") (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "lib") #t)))) + ;; Mimic upstream commit 706b6aad06, for compatibility with + ;; newer jsoncpp. Remove this for > 5.1.0. + (substitute* "cmake/Modules/FindJson.cmake" + (("features\\.h") + "allocator.h")) + + ;; Delete bundled libraries. + (delete-file-recursively "lib") + #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 2bd1872bfd..00a8d27387 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -283,7 +283,7 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public jsoncpp (package (name "jsoncpp") - (version "1.9.1") + (version "1.9.2") (home-page "https://github.com/open-source-parsers/jsoncpp") (source (origin (method git-fetch) @@ -291,7 +291,7 @@ that implements both the msgpack and msgpack-rpc specifications.") (file-name (git-file-name name version)) (sha256 (base32 - "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj")))) + "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"))) |