From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AGgiL3rLAmK+gAAAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 20:58:50 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0EPoK3rLAmKXigAAauVa8A (envelope-from ) for ; Tue, 08 Feb 2022 20:58:50 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 578142C3B5 for ; Tue, 8 Feb 2022 20:58:50 +0100 (CET) Received: from localhost ([::1]:41122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWdV-0007jy-2w for larch@yhetil.org; Tue, 08 Feb 2022 14:58:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHUsW-0004vq-LC for guix-patches@gnu.org; Tue, 08 Feb 2022 13:06:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHUsM-0003FI-3j for guix-patches@gnu.org; Tue, 08 Feb 2022 13:06:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHUsL-00055g-VN for guix-patches@gnu.org; Tue, 08 Feb 2022 13:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53880] [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 18:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53880@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 53880-submit@debbugs.gnu.org id=B53880.164434354619536 (code B ref 53880); Tue, 08 Feb 2022 18:06:01 +0000 Received: (at 53880) by debbugs.gnu.org; 8 Feb 2022 18:05:46 +0000 Received: from localhost ([127.0.0.1]:48583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHUs5-00054y-TR for submit@debbugs.gnu.org; Tue, 08 Feb 2022 13:05:46 -0500 Received: from jpoiret.xyz ([206.189.101.64]:37802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHUs4-00054p-Mj for 53880@debbugs.gnu.org; Tue, 08 Feb 2022 13:05:44 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id F38B0185182; Tue, 8 Feb 2022 18:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1644343544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rLfl3p5V5/oEGIvYrACbGSXHCyLlXKScqg2FprAR5+A=; b=OtWuLBXbLRAqroTp0XcglFA1v5YQS+ECu/JeiXN0DWoYUnuMckKQce4SxUmPtHNz6iuYY5 N3dTvbn14OFmf2KNVmVvA0s0NDyAyZRvh9JsY3YPywmzl7oHq20da2nd48zdNDgexnSxws Jf5zxs44UQbZ0ijmzDtuG+qxV7q2LcEr5UQCmqXFtJzoTmS44FZkdHb4tkCBDYCXMZGQfp mzrk3/aHRdwP7j26W7u/JB0PZn/2/6cLYDvgRmRxkJezQME3JtQqPjnHk24zihr0uRT9Cu M2gz1TdP5szA7TRpNka0LJA94Cuy8mFxVxcK5NwzhfrcfB5ctR+kh1GYD5kNcQ== Date: Tue, 8 Feb 2022 19:05:40 +0100 Message-Id: <20220208180542.11619-1-dev@jpoiret.xyz> In-Reply-To: <20220208180333.11502-1-dev@jpoiret.xyz> References: <20220208180333.11502-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644350330; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rLfl3p5V5/oEGIvYrACbGSXHCyLlXKScqg2FprAR5+A=; b=hy05QT1iGv5kE9M0Ki3NExn2SufIvmhNpBqiWPZovUkdduS6Y2taxGga5IniUN0SZiHqy8 2iwopN2AGf7tuXYp61BNjGag/ggi+XfHlpk26xBcWD/12LMj5TZpeUlUiMIgm0onlQ3YFc lSIPisd/PSlanu8VzzKOfnoe1aYy1AiL37pCqLhqlvOmtiz9jaOxiYCe5FL6wNRX25s7yB Zlr/MNGT8bT/KZ6NWjZMvww6JdvJSd9ZGjZBYRczymXgboatc9o1sqa3dhxbjR9cC2Un7Z Ya1woRQdGXeTQHX3GZPJc6HHFr/r5gsBRXXhEfbVQ7KX0IG3yUWan4HAmVLI1g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644350330; a=rsa-sha256; cv=none; b=dBEMRxFgCHerYiRdPdDuUB6WEl5PwyMppddVQxY7YtKKb5qz24vZK070Od5C8j5G09mPT8 5Akr1PVQyCuWmwioyujqh+hmOr5d3+/FlD4UVA5PGySLJuDK/nYPlxGqK97RThd5s7Acqt IRJ5QO54NOUVOPCvFw5u0bR8CU75+I2VSh2NDAlYFOBmj+Sph2qCaUDn4tEqKP4hBd6wKc 2oONGC1ZE33WIk8NsY8msAXTiEdDZozxVKspcQLHOQj6dwLaXoO5a3d0NoYOgwROmP9VII JHdoye4jOovcaR4DIu16kBzq/TJSMSWHh7t2CqRbX/91nGWBL42GQwFbJ15ugg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=OtWuLBXb; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.13 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=OtWuLBXb; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 578142C3B5 X-Spam-Score: -3.13 X-Migadu-Scanner: scn0.migadu.com X-TUID: cXIRr8VQY1VE * gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Try to wrap the original program, and not the wrapper, as wrap-program handles that properly. --- gnu/packages/vpn.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 7f1d10d1eb..150dfa31b5 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -753,7 +753,7 @@ (define-public protonvpn-cli ;; 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"))) + "/bin/protonvpn"))) (wrap-program entrypoint #:sh (search-input-file inputs "bin/bash") `("PATH" ":" prefix -- 2.34.0