From d9580a26c7ad9638fee4282c24db8f48ec8f6fec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Nov 2019 15:31:14 +0100 Subject: 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. --- gnu/packages/games.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') 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 @@ (define-public minetest (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 -- cgit v1.2.3