From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:36772) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3eKm-0006oG-5n 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 1j3eKl-000507-6b for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3eKl-0004zv-2t for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j3eKk-00057W-UO for guix-patches@gnu.org; Mon, 17 Feb 2020 06:13:02 -0500 Subject: [bug#39599] [PATCH 4/4] gnu: net-base: Use copy build system. Resent-Message-ID: From: Pierre Neidhardt Date: Mon, 17 Feb 2020 12:12:28 +0100 Message-Id: <20200217111228.23716-4-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/admin.scm (net-base)[build-system]: Use copy-build-system. --- gnu/packages/admin.scm | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4780fe124e..1f384edb2c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -54,6 +54,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -566,30 +567,12 @@ to allow automatic login and starting any app.") (sha256 (base32 "12xqjwg3p4rzmmh2iib6sigm9l29y3dgk74mmnw64k84jnbwdxl1")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) - (etc (string-append output "/etc"))) - (setenv "PATH" (string-append xz "/bin")) - (invoke (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "netbase-" version)) - (mkdir-p etc) - (for-each copy-file - '("etc-services" "etc-protocols" "etc-rpc") - (map (cut string-append etc "/" <>) - '("services" "protocols" "rpc"))) - #t)))) - (native-inputs `(("tar" ,tar) - ("xz" ,xz))) + `(#:install-plan + `(("etc-services" "etc/services") + ("etc-protocols" "etc/protocols") + ("etc-rpc" "etc/rpc")))) (synopsis "IANA protocol, port, and RPC number assignments") (description "This package provides the /etc/services, /etc/protocols, and /etc/rpc -- 2.25.0