all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Pierre Neidhardt <mail@ambrevar.xyz>
To: 39599@debbugs.gnu.org
Subject: [bug#39599] [PATCH 4/4] gnu: net-base: Use copy build system.
Date: Mon, 17 Feb 2020 12:12:28 +0100	[thread overview]
Message-ID: <20200217111228.23716-4-mail@ambrevar.xyz> (raw)
In-Reply-To: <20200217111228.23716-1-mail@ambrevar.xyz>

* 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

  parent reply	other threads:[~2020-02-17 11:13 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-14 12:51 [bug#39599] [PATCH 0/2] New build system: copy-build-system Pierre Neidhardt
2020-02-14 12:53 ` [bug#39599] [PATCH 1/2] build-system: Add copy-build-system Pierre Neidhardt
2020-02-14 12:53   ` [bug#39599] [PATCH 2/2] gnu: gcide: Use the copy-build-system Pierre Neidhardt
2020-02-14 13:39   ` [bug#39599] [PATCH 1/2] build-system: Add copy-build-system Giovanni Biscuolo
2020-02-16 13:16     ` Pierre Neidhardt
2020-02-17 11:12 ` [bug#39599] [PATCH 1/4] " Pierre Neidhardt
2020-02-17 11:12   ` [bug#39599] [PATCH 2/4] gnu: gcide: Use the copy-build-system Pierre Neidhardt
2020-02-17 11:12   ` [bug#39599] [PATCH 3/4] gnu: Add clojure-wrapper Pierre Neidhardt
2020-02-17 11:12   ` Pierre Neidhardt [this message]
2020-02-17 11:48   ` [bug#39599] [PATCH 1/4] build-system: Add copy-build-system Mathieu Othacehe
2020-02-20  9:47   ` Ricardo Wurmus
2020-02-20 10:00     ` Pierre Neidhardt
2020-02-20  1:06 ` Alex Griffin
2020-02-20  8:40   ` Pierre Neidhardt
2020-02-20  8:44     ` Mathieu Othacehe
2020-02-20 15:41     ` Pierre Neidhardt
2020-02-20 17:09       ` [bug#39599] " Julien Lepiller
2020-02-20 18:00         ` Pierre Neidhardt
2020-02-21  9:53           ` Pierre Neidhardt
2020-02-21 10:43             ` Nicolas Goaziou
2020-02-21 11:07               ` Pierre Neidhardt
2020-02-21 11:43                 ` Nicolas Goaziou
2020-02-21 12:04                   ` Pierre Neidhardt
2020-02-21 11:50               ` Tobias Geerinckx-Rice via Guix-patches via
2020-02-21 12:06                 ` Pierre Neidhardt
2020-02-21  3:37   ` [bug#39599] Jack Hill
2020-02-21  3:37     ` [bug#39599] [PATCH v2] gnu: Add gnome-shell-extension-paperwm Jack Hill
2020-02-21 14:34       ` Alex Griffin
2020-02-21 16:22         ` Jack Hill
2020-02-21 18:48           ` Alex Griffin
2020-02-21 18:51             ` Jack Hill

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200217111228.23716-4-mail@ambrevar.xyz \
    --to=mail@ambrevar.xyz \
    --cc=39599@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.