From patchwork Fri Jan 1 19:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 26162 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A63F527BC09; Fri, 1 Jan 2021 19:28:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D47227BC08 for ; Fri, 1 Jan 2021 19:28:17 +0000 (GMT) Received: from localhost ([::1]:49804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvQ5w-0003Mt-R6 for patchwork@mira.cbaines.net; Fri, 01 Jan 2021 14:28:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvQ5k-0003JH-A2 for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvQ5i-0006mK-VP for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvQ5i-00052l-ST for guix-patches@gnu.org; Fri, 01 Jan 2021 14:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45601] [PATCH 4/6] gnu: vlang: Use system cJSON. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jan 2021 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45601@debbugs.gnu.org Received: via spool by 45601-submit@debbugs.gnu.org id=B45601.160952926019306 (code B ref 45601); Fri, 01 Jan 2021 19:28:02 +0000 Received: (at 45601) by debbugs.gnu.org; 1 Jan 2021 19:27:40 +0000 Received: from localhost ([127.0.0.1]:34904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5L-00051F-LQ for submit@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:39 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:24973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvQ5J-00050T-Ox for 45601@debbugs.gnu.org; Fri, 01 Jan 2021 14:27:38 -0500 Date: Fri, 01 Jan 2021 19:27:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609529251; bh=Ltrw3pImFVK0tOsk5myX5Li+/CADaVFpreqkhOd8GcQ=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=iBRav1ybvxz20YbVhOFSjyRCkPo0QRfq7dPr09qAGVh0iU2eqI3lGeZoalJAJphut +C98CnmTNPnwJfwJQI1DeC4ZgBIDjzXEGI3/FRfQL1bhi9zoIQeBgS66I45HtyxX8j ucswmzyEdMicKoXBM6F3+zSwotvwkbYz8A1sezps= Message-ID: <20210101192713.23655-4-rprior@protonmail.com> In-Reply-To: <20210101192713.23655-1-rprior@protonmail.com> References: <20210101192713.23655-1-rprior@protonmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: Ryan Prior X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vlang.scm (vlang): Use system cJSON. --- gnu/packages/vlang.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index a2f6e93945..db7438d7f7 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -63,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 @@ -85,7 +86,10 @@ (("--branch") "")) (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") @@ -145,7 +149,8 @@ #t))))) (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 will