GNU bug report logs - #45296
[PATCH] gnu: miredo: Fix to use iproute2 from the store.

Previous Next

Full log

View this message in rfc822 format

From: John Doe <dftxbs3e <at> free.fr>
To: 45296 <at> debbugs.gnu.org
Cc: John Doe <dftxbs3e <at> free.fr>
Subject: [bug#45296] [PATCH] gnu: miredo: Fix to use iproute2 from the store.
Date: Thu, 17 Dec 2020 15:24:18 +0100

* 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.