From patchwork Wed Dec 23 03:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Prior X-Patchwork-Id: 25888 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A95D627BC05; Wed, 23 Dec 2020 03:39:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 72C6F27BC04 for ; Wed, 23 Dec 2020 03:39:34 +0000 (GMT) Received: from localhost ([::1]:44584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kruzt-0006u5-IY for patchwork@mira.cbaines.net; Tue, 22 Dec 2020 22:39:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kruzQ-0006tv-4U for guix-patches@gnu.org; Tue, 22 Dec 2020 22:39:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kruzN-0000DW-Tq for guix-patches@gnu.org; Tue, 22 Dec 2020 22:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kruzN-0002WY-Ot for guix-patches@gnu.org; Tue, 22 Dec 2020 22:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45284] [PATCH] gnu: protonvpn-cli: Stop propagating inputs. References: <20201217045258.3365-1-rprior@protonmail.com> In-Reply-To: <20201217045258.3365-1-rprior@protonmail.com> Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Dec 2020 03:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45284 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45284@debbugs.gnu.org Received: via spool by 45284-submit@debbugs.gnu.org id=B45284.16086947059638 (code B ref 45284); Wed, 23 Dec 2020 03:39:01 +0000 Received: (at 45284) by debbugs.gnu.org; 23 Dec 2020 03:38:25 +0000 Received: from localhost ([127.0.0.1]:51418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kruyn-0002VN-9J for submit@debbugs.gnu.org; Tue, 22 Dec 2020 22:38:25 -0500 Received: from mail2.protonmail.ch ([185.70.40.22]:28328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kruyj-0002V3-OR for 45284@debbugs.gnu.org; Tue, 22 Dec 2020 22:38:24 -0500 Date: Wed, 23 Dec 2020 03:38:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608694694; bh=Q5gy/yvsdGguPSI9xNwOTKuNAzzuZGNxGQ1mazO+3I0=; h=Date:To:From:Reply-To:Subject:From; b=KzGu+HjJiuHMFzdHC0er1LdLD30PTiBOYMCHLKUobOV8nYEvdovtSCptFoGE3jrIz 7E+Kj/MxinjVtxHJC02mv1Z0UPsogl+asu9fvUN/8WczsoSw9YSQaZ2ttEhE9FIGEW xVn8qNupWzXAO33GmgbKtO9e5HuPN5Pa/GPLum9Q= Message-ID: <20201223033802.16667-1-rprior@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: Ryan Prior X-getmail-retrieved-from-mailbox: Patches * 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