guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: miredo: Fix to use iproute2 from the store.


From: guix-commits
Subject: 01/02: gnu: miredo: Fix to use iproute2 from the store.
Date: Sat, 26 Dec 2020 15:39:07 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 77a48a4c5de26db652d8eb4e1c414806e12fecc1
Author: John Doe <dftxbs3e@free.fr>
AuthorDate: Thu Dec 17 15:24:18 2020 +0100

    gnu: miredo: Fix to use iproute2 from the store.
    
    * gnu/packages/networking.scm (miredo):
    [inputs]: Add iproute.
    [arguments]: New phase 'patch-iproute2 that patches sources to use
    iproute2 from the store.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/networking.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index ff1de3a..479f532 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -702,6 +702,13 @@ 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
@@ -709,6 +716,8 @@ or, more generally, MAC addresses of the same category of 
hardware.")
             (substitute* "src/Makefile"
               (("^TESTS = .*") "TESTS = \n"))
             #t)))))
+    (inputs
+     `(("iproute" ,iproute)))
     (home-page "https://www.remlab.net/miredo/";)
     (synopsis "Teredo IPv6 tunneling software")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]