From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36757) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3eKl-0006oE-AH for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3eKk-0004z2-93 for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60313) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3eKk-0004yy-5Z for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j3eKk-00057H-1o for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:02 -0500 Subject: [bug#39599] [PATCH 2/4] gnu: gcide: Use the copy-build-system. Resent-Message-ID: From: Pierre Neidhardt Date: Mon, 17 Feb 2020 12:12:26 +0100 Message-Id: <20200217111228.23716-2-mail@ambrevar.xyz> In-Reply-To: <20200217111228.23716-1-mail@ambrevar.xyz> References: <20200214125144.4185-1-mail@ambrevar.xyz> <20200217111228.23716-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39599@debbugs.gnu.org * 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 -- 2.25.0