nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: iodine: Use net-tools' ifconfig with an absolute path. 

* gnu/packages/networking.scm (iodine)[arguments]: Add fix-ifconfig-path
phase.
[inputs]: Add net-tools.
This commit is contained in:
Tobias Geerinckx-Rice 2016-09-15 01:15:02 +02:00
parent 71af71dc74
commit 60880ac556
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/networking.scm
View File

@ -391,8 +391,14 @@ and min/max network usage.")
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'fix-ifconfig-path
;; This package works only with the net-tools version of ifconfig.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/tun.c"
(("PATH=[^ ]* ")
(string-append (assoc-ref inputs "net-tools") "/sbin/")))))
(add-before 'check 'delete-failing-tests (add-before 'check 'delete-failing-tests
;; Avoid https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802105 ;; Avoid https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802105.
(lambda _ (lambda _
(substitute* "tests/common.c" (substitute* "tests/common.c"
(("tcase_add_test\\(tc, \ (("tcase_add_test\\(tc, \
@ -401,7 +407,8 @@ test_parse_format_ipv(4(|_listen_all|_mapped_ipv6)|6)\\);")
#:make-flags (list "CC=gcc" #:make-flags (list "CC=gcc"
(string-append "prefix=" (assoc-ref %outputs "out"))) (string-append "prefix=" (assoc-ref %outputs "out")))
#:test-target "test")) #:test-target "test"))
(inputs `(("zlib" ,zlib))) (inputs `(("net-tools" ,net-tools)
("zlib" ,zlib)))
(native-inputs `(("check" ,check) (native-inputs `(("check" ,check)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://code.kryo.se/iodine/") (home-page "http://code.kryo.se/iodine/")