unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: John Doe <dftxbs3e@free.fr>
To: 45296@debbugs.gnu.org
Cc: John Doe <dftxbs3e@free.fr>
Subject: [bug#45296] [PATCH] gnu: miredo: Fix to use iproute2 from the store.
Date: Thu, 17 Dec 2020 15:24:18 +0100	[thread overview]
Message-ID: <20201217142418.4497-1-dftxbs3e@free.fr> (raw)

* gnu/packages/networking.scm (miredo):
[inputs]: Add iproute.
[arguments]: New phase 'patch-iproute2 that patches sources to use
iproute2 from the store.
---
 gnu/packages/networking.scm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1226b8606f..281c4a0179 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -688,13 +688,22 @@ or, more generally, MAC addresses of the same category of hardware.")
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-iproute2
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((iproute (assoc-ref inputs "iproute"))
+                    (ip (string-append iproute "/sbin/ip")))
+               (substitute* "misc/client-hook.iproute"
+                 (("/sbin/ip") ip))
+               #t)))
          ;; The checkconf test in src/ requires network access.
          (add-before
-          'check 'disable-checkconf-test
-          (lambda _
-            (substitute* "src/Makefile"
-              (("^TESTS = .*") "TESTS = \n"))
-            #t)))))
+             'check 'disable-checkconf-test
+           (lambda _
+             (substitute* "src/Makefile"
+               (("^TESTS = .*") "TESTS = \n"))
+             #t)))))
+    (inputs
+     `(("iproute" ,iproute)))
     (home-page "https://www.remlab.net/miredo/")
     (synopsis "Teredo IPv6 tunneling software")
     (description
-- 
2.29.2





             reply	other threads:[~2020-12-17 14:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-17 14:24 John Doe [this message]
2020-12-26 20:31 ` bug#45296: [PATCH] gnu: miredo: Fix to use iproute2 from the store Efraim Flashner

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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=20201217142418.4497-1-dftxbs3e@free.fr \
    --to=dftxbs3e@free.fr \
    --cc=45296@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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).