diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-12-11 12:21:54 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-12-11 15:50:00 +0100 |
| commit | b47e083b594dc2c6c26e93723e6244d964f4d19d (patch) | |
| tree | 31e18a3555ab1b7128d9ede39921b2c0140fd1a0 /gnu/packages | |
| parent | 1e2640baacc320e30c852683b6b7544b6290def8 (diff) | |
| download | guix-b47e083b594dc2c6c26e93723e6244d964f4d19d.tar.gz guix-b47e083b594dc2c6c26e93723e6244d964f4d19d.zip | |
gnu: vpnc-scripts: Use WRAP-SCRIPT.
* gnu/packages/vpn.scm (vpnc-scripts)[arguments]: Use WRAP-SCRIPT instead of
WRAP-PROGRAM.
[inputs]: Add guile.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/vpn.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 1fd313c46c..1c2228c426 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) + #:use-module (gnu packages guile) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages nss) @@ -134,7 +136,8 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") (base32 "1g41yarz2bl0f73kbjqnywr485ghanbp7nmspklfb0n07yp0z6ak")))) (build-system gnu-build-system) - (inputs `(("coreutils" ,coreutils) + (inputs `(("guile" ,guile-2.2) ; for the wrapper scripts + ("coreutils" ,coreutils) ("grep" ,grep) ("iproute2" ,iproute) ; for ‘ip’ ("net-tools" ,net-tools) ; for ‘ifconfig’, ‘route’ @@ -177,7 +180,7 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") (let ((out (assoc-ref outputs "out"))) (for-each (lambda (script) - (wrap-program script + (wrap-script (string-append out "/etc/vpnc/" script) `("PATH" ":" prefix ,(map (lambda (name) (let ((input (assoc-ref inputs name))) @@ -189,8 +192,9 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.") "net-tools" "sed" "which"))))) - (find-files (string-append out "/etc/vpnc/vpnc-script") - "^vpnc-script")) + (list "vpnc-script-ptrtd" + "vpnc-script-sshd" + "vpnc-script")) #t)))) #:tests? #f)) ; no tests (home-page "http://git.infradead.org/users/dwmw2/vpnc-scripts.git") |