From b47e083b594dc2c6c26e93723e6244d964f4d19d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 Dec 2019 12:21:54 +0100 Subject: gnu: vpnc-scripts: Use WRAP-SCRIPT. * gnu/packages/vpn.scm (vpnc-scripts)[arguments]: Use WRAP-SCRIPT instead of WRAP-PROGRAM. [inputs]: Add guile. --- gnu/packages/vpn.scm | 12 ++++++++---- 1 file 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 ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2019 Rutger Helling +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; 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") -- cgit v1.2.3