From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36786)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fNH7C-0005b1-M7
	for guix-patches@gnu.org; Mon, 28 May 2018 08:19:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fNH77-0006ra-SY
	for guix-patches@gnu.org; Mon, 28 May 2018 08:19:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:43852)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fNH77-0006rA-Pu
	for guix-patches@gnu.org; Mon, 28 May 2018 08:19:01 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fNH77-0005mR-Hp
	for guix-patches@gnu.org; Mon, 28 May 2018 08:19:01 -0400
Subject: [bug#31430] [PATCH 4/6] gnu: Add json-modern-cxx.
Resent-Message-ID: <handler.31430.B31430.152750992322192@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <BLUPR16MB05004A2B1B8291FA97CD7597929E0@BLUPR16MB0500.namprd16.prod.outlook.com>
	<BLUPR16MB0500328748A5B5C06BAA0D07926E0@BLUPR16MB0500.namprd16.prod.outlook.com>
	<BLUPR16MB0500DC4354D45ABD4E9A52F0926E0@BLUPR16MB0500.namprd16.prod.outlook.com>
Date: Mon, 28 May 2018 14:18:28 +0200
In-Reply-To: <BLUPR16MB0500DC4354D45ABD4E9A52F0926E0@BLUPR16MB0500.namprd16.prod.outlook.com>
	(Fis Trivial's message of "Mon, 28 May 2018 08:11:23 +0000")
Message-ID: <871sdw2ctn.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Fis Trivial <ybbs.daans@hotmail.com>
Cc: 31430@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Fis Trivial <ybbs.daans@hotmail.com> skribis:

> * gnu/packages/cpp.scm (json-modern-cxx): New variable.

Applied with the changes below (=E2=80=98clang-runtime=E2=80=99 is not need=
ed AFAICS.)

Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 80b491119..4831ab035 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -228,13 +228,13 @@ as ordering relation.")
                   (string-append
                    "#include <fifo_map/" fifo-map-hpp ">")))))))))
     (native-inputs
-     `(("amalgamate" ,amalgamate)
-       ("catch2" ,catch-framework2)
-       ("clang-runtime" ,clang-runtime)
+     `(("amalgamate" ,amalgamate)))
+    (inputs
+     `(("catch2" ,catch-framework2)
        ("fifo-map" ,fifo-map)))
     (home-page "https://github.com/nlohmann/json")
     (build-system cmake-build-system)
     (synopsis "JSON parser and printer library for C++")
-    (description "JSON for Modern C++ is a C++ json library that provides
+    (description "JSON for Modern C++ is a C++ JSON library that provides
 intutive syntax and trivial integration.")
     (license license:expat)))

--=-=-=--