From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6ADrDavDxV+ONAAA0tVLHw (envelope-from ) for ; Tue, 01 Dec 2020 04:16:43 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YF2dCavDxV+JawAAbx9fmQ (envelope-from ) for ; Tue, 01 Dec 2020 04:16:43 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EBC1794030E for ; Tue, 1 Dec 2020 04:16:42 +0000 (UTC) Received: from localhost ([::1]:40256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjx5l-0001Cc-V2 for larch@yhetil.org; Mon, 30 Nov 2020 23:16:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjx59-0000tE-Kw for guix-patches@gnu.org; Mon, 30 Nov 2020 23:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjx59-0007AT-DL for guix-patches@gnu.org; Mon, 30 Nov 2020 23:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjx59-0002qr-99 for guix-patches@gnu.org; Mon, 30 Nov 2020 23:16:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44978] [PATCH 3/3] gnu: vlang: Use system cJSON. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Dec 2020 04:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44978@debbugs.gnu.org Received: via spool by 44978-submit@debbugs.gnu.org id=B44978.160679614410918 (code B ref 44978); Tue, 01 Dec 2020 04:16:03 +0000 Received: (at 44978) by debbugs.gnu.org; 1 Dec 2020 04:15:44 +0000 Received: from localhost ([127.0.0.1]:57403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjx4p-0002q2-LD for submit@debbugs.gnu.org; Mon, 30 Nov 2020 23:15:43 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:58552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjx4n-0002po-6g for 44978@debbugs.gnu.org; Mon, 30 Nov 2020 23:15:42 -0500 Date: Tue, 01 Dec 2020 04:15:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1606796134; bh=H8derxvStelvFIUaNBBjIADYeYqtaX8iBrPTBWEI5JA=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=GBUmKSrlLifF5XY+31udTsHekS3wRnCsID088onWtztX+VQIG0rdd2yGI/+IgqCiK +39+3cyjPZ6ApBazmGlEzVPRIW5vqIfPJAtksa5dKcpy6gk00S3jXm0tj7CW0YyTyR I3GUUqqsnNB6LaOy/UeLKliNZXDpZb5l9DyBptm8= Message-ID: <20201201041510.8476-3-rprior@protonmail.com> In-Reply-To: <20201201041510.8476-1-rprior@protonmail.com> References: <20201201041510.8476-1-rprior@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches From: Ryan Prior via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.29 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=protonmail.com header.s=protonmail header.b=GBUmKSrl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: EBC1794030E X-Spam-Score: -1.29 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: 16Da3sohZPls * gnu/packages/vlang.scm (vlang): Use system cJSON. --- gnu/packages/vlang.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index 83bacfc6c3..334901ffb6 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (guix git-download) @@ -62,7 +63,8 @@ (snippet '(begin ;; Eventually remove the whole thirdparty directory. - (delete-file-recursively "thirdparty/bignum"))))) + (delete-file-recursively "thirdparty/bignum") + (delete-file-recursively "thirdparty/cJSON"))))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -83,7 +85,10 @@ (("rm -rf") "true")) (substitute* "vlib/math/big/big.v" (("@VROOT/thirdparty/bignum") - (string-append (assoc-ref inputs "tiny-bignum") "/share")))= )) + (string-append (assoc-ref inputs "tiny-bignum") "/share"))) + (substitute* "vlib/json/json_primitives.v" + (("@VROOT/thirdparty/cJSON") + (assoc-ref inputs "cJSON"))))) (add-before 'build 'patch-cc (lambda _ (let* ((bin "tmp/bin") @@ -138,7 +143,8 @@ (copy-file "v.mod" vmod))))))) (inputs `(("glib" ,glib) - ("tiny-bignum" ,tiny-bignum))) + ("tiny-bignum" ,tiny-bignum) + ("cJSON" ,(package-source cjson)))) (native-inputs `(("vc" ;; Versions are not consistently tagged, but the matching commit wi= ll --=20 2.29.2