From: Ryan Prior via Guix-patches via <guix-patches@gnu.org>
To: 45284@debbugs.gnu.org
Subject: [bug#45284] [PATCH] gnu: protonvpn-cli: Stop propagating inputs.
Date: Wed, 23 Dec 2020 03:38:08 +0000 [thread overview]
Message-ID: <20201223033802.16667-1-rprior@protonmail.com> (raw)
In-Reply-To: <20201217045258.3365-1-rprior@protonmail.com>
* gnu/packages/vpn.scm (protonvpn-cli): Stop propagating inputs.
- Adds all necessary inputs.
- Wraps entrypoint to avoid propagation.
---
gnu/packages/vpn.scm | 37 +++++++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index c1f0b65e84..72ca9ee31b 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -364,16 +364,41 @@ 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
--
2.29.2
next prev parent reply other threads:[~2020-12-23 3:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 4:53 [bug#45284] [PATCH] gnu: protonvpn-cli: Update to 2.2.6 Ryan Prior via Guix-patches via
2020-12-17 4:57 ` [bug#45284] Propagated packages Ryan Prior via Guix-patches via
2020-12-17 9:55 ` Efraim Flashner
2020-12-23 3:38 ` Ryan Prior via Guix-patches via [this message]
2020-12-24 21:20 ` [bug#45284] [PATCH] gnu: protonvpn-cli: Stop propagating inputs Leo Famulari
2020-12-23 3:42 ` [bug#45284] Double wrapper for protonvpn Ryan Prior via Guix-patches via
2020-12-24 21:21 ` bug#45284: " Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201223033802.16667-1-rprior@protonmail.com \
--to=guix-patches@gnu.org \
--cc=45284@debbugs.gnu.org \
--cc=rprior@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).