From patchwork Fri Feb 14 12:53:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20247 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 7188127BBEA; Fri, 14 Feb 2020 12:55:13 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI 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 ESMTP id 37D8127BBE4 for ; Fri, 14 Feb 2020 12:55:13 +0000 (GMT) Received: from localhost ([::1]:38158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2aUy-0007ER-Kl for patchwork@mira.cbaines.net; Fri, 14 Feb 2020 07:55:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43079) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2aUo-00078V-VJ for guix-patches@gnu.org; Fri, 14 Feb 2020 07:55:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2aUn-0006Gp-WD for guix-patches@gnu.org; Fri, 14 Feb 2020 07:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2aUn-0006G5-Sf for guix-patches@gnu.org; Fri, 14 Feb 2020 07:55:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j2aUn-00076s-Rk for guix-patches@gnu.org; Fri, 14 Feb 2020 07:55:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39599] [PATCH 2/2] gnu: gcide: Use the copy-build-system. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Feb 2020 12:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39599 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39599@debbugs.gnu.org Received: via spool by 39599-submit@debbugs.gnu.org id=B39599.158168484227247 (code B ref 39599); Fri, 14 Feb 2020 12:55:01 +0000 Received: (at 39599) by debbugs.gnu.org; 14 Feb 2020 12:54:02 +0000 Received: from localhost ([127.0.0.1]:60965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2aTq-00075O-5C for submit@debbugs.gnu.org; Fri, 14 Feb 2020 07:54:02 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:60213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j2aTn-00074s-Vh for 39599@debbugs.gnu.org; Fri, 14 Feb 2020 07:54:00 -0500 X-Originating-IP: 92.169.129.147 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 8ABDCE0008 for <39599@debbugs.gnu.org>; Fri, 14 Feb 2020 12:53:58 +0000 (UTC) From: Pierre Neidhardt Date: Fri, 14 Feb 2020 13:53:57 +0100 Message-Id: <20200214125357.5262-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200214125357.5262-1-mail@ambrevar.xyz> References: <20200214125357.5262-1-mail@ambrevar.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dictionaries.scm (gcide2)[build-system]: Use the copy-build-system. --- gnu/packages/dictionaries.scm | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index cd0a5db93c..d40c43f74e 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -31,6 +31,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix build-system copy) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -109,25 +110,10 @@ acronyms distributed as an info document.") (sha256 (base32 "1n3bp91sik66z3ca7mjqbr9nck3hg5ck0c8g84xc0qnfpx5vznh2")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:builder (begin - (use-modules (guix build utils)) - (let* ((src (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (out (assoc-ref %outputs "out")) - (datadir (string-append out "/share/gcide"))) - (set-path-environment-variable "PATH" '("bin") - (list tar xz)) - (mkdir-p datadir) - (invoke "tar" "-C" datadir - "--strip-components=1" - "-xvf" src))) - #:modules ((guix build utils)))) - (native-inputs - `(("tar" ,tar) - ("xz" ,xz))) + '(#:install-plan + '(("." "share/gcide/" #:exclude ("COPYING"))))) (synopsis "GNU Collaborative International Dictionary of English") (description "GCIDE is a free dictionary based on a combination of sources. It can