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

gnu: vpnc: Make sure 'vpnc-script' finds the commands it needs. 

* gnu/packages/vpn.scm (vpnc)[inputs]: Add NET-TOOLS and IPROUTE.
[arguments]: Use 'modify-phases'.  Wrap 'vpnc-script'.
This commit is contained in:
Ludovic Courtès 2016-02-05 16:36:38 +01:00
parent a7d8c466db
commit 42c97811c9
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnu/packages/vpn.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; ;;;
@ -70,19 +70,37 @@ endpoints.")
(patches (list (search-patch "vpnc-script.patch"))))) (patches (list (search-patch "vpnc-script.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("libgcrypt" ,libgcrypt) (inputs `(("libgcrypt" ,libgcrypt)
("perl" ,perl))) ("perl" ,perl)
;; The following packages provide commands that 'vpnc-script'
;; expects.
("net-tools" ,net-tools) ;ifconfig, route
("iproute2" ,iproute))) ;ip
(arguments (arguments
`(#:tests? #f ; there is no check target `(#:tests? #f ; there is no check target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "Makefile" (substitute* "Makefile"
(("PREFIX=/usr/local") (string-append "PREFIX=" out))) (("PREFIX=/usr/local") (string-append "PREFIX=" out)))
(substitute* "Makefile" (substitute* "Makefile"
(("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" out "/etc/vpnc"))))) (("ETCDIR=/etc/vpnc") (string-append "ETCDIR=" out
%standard-phases))) "/etc/vpnc"))))))
(add-after 'install 'wrap-vpnc-script
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap 'etc/vpnc/vpnc-script' so that it finds the commands it
;; needs. Assume coreutils/grep/sed are in $PATH.
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/etc/vpnc/vpnc-script")
`("PATH" ":" prefix
(,(string-append (assoc-ref inputs "net-tools")
"/sbin")
,(string-append (assoc-ref inputs "net-tools")
"/bin")
,(string-append (assoc-ref inputs "iproute2")
"/sbin"))))))))))
(synopsis "Client for Cisco VPN concentrators") (synopsis "Client for Cisco VPN concentrators")
(description (description
"vpnc is a VPN client compatible with Cisco's EasyVPN equipment. "vpnc is a VPN client compatible with Cisco's EasyVPN equipment.