[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: protonvpn-cli: Stop propagating inputs.
From: |
guix-commits |
Subject: |
branch master updated: gnu: protonvpn-cli: Stop propagating inputs. |
Date: |
Thu, 24 Dec 2020 16:20:34 -0500 |
This is an automated email from the git hooks/post-receive script.
lfam pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new bcfa8b4 gnu: protonvpn-cli: Stop propagating inputs.
bcfa8b4 is described below
commit bcfa8b4a285c4948b61bc7297ade28a7c0e59e2c
Author: Ryan Prior <rprior@protonmail.com>
AuthorDate: Wed Dec 23 03:38:08 2020 +0000
gnu: protonvpn-cli: Stop propagating inputs.
* gnu/packages/vpn.scm (protonvpn-cli)[inputs]: Add dialog, iproute2,
iptables,
ncurses, openvpn, procps, python-requests, and which.
[arguments]: Add a 'wrap-wrapper' phase.
Signed-off-by: Leo Famulari <leo@famulari.name>
---
gnu/packages/vpn.scm | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index c1f0b65..8b5da13 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -364,16 +364,42 @@ traversing network address translators (@dfn{NAT}s) and
firewalls.")
(sha256
(base32 "0y7v9ikrmy5dbjlpbpacp08gy838i8z54m8m4ps7ldk1j6kyia3n"))))
(build-system python-build-system)
- (arguments '(#:tests? #f)) ; no tests in repo
+ (arguments
+ '(#:tests? #f ; no tests in repo
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'wrap 'wrap-wrapper
+ ;; Wrap entrypoint with paths to its hard dependencies.
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((entrypoint (string-append (assoc-ref outputs "out")
+ "/bin/.protonvpn-real")))
+ (wrap-program entrypoint
+ `("PATH" ":" prefix
+ ,(map (lambda (name)
+ (let ((input (assoc-ref inputs name)))
+ (string-append input "/bin:"
+ input "/sbin")))
+ (list "dialog"
+ "iproute2"
+ "iptables"
+ "ncurses"
+ "openvpn"
+ "procps"
+ "which")))))
+ #t)))))
(native-inputs
`(("python-docopt" ,python-docopt)))
(inputs
- `(("python-jinja2" ,python-jinja2)
+ `(("dialog" ,dialog)
+ ("iproute2" ,iproute)
+ ("iptables" ,iptables)
+ ("ncurses" ,ncurses)
+ ("openvpn" ,openvpn)
+ ("procps" ,procps)
+ ("python-jinja2" ,python-jinja2)
("python-pythondialog" ,python-pythondialog)
- ("python-requests" ,python-requests)))
- (propagated-inputs
- `(("openvpn" ,openvpn)
- ("dialog" ,dialog)))
+ ("python-requests" ,python-requests)
+ ("which" ,which)))
(synopsis "Command-line client for ProtonVPN")
(description
"This is the official command-line interface for ProtonVPN, a secure
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: protonvpn-cli: Stop propagating inputs.,
guix-commits <=