From patchwork Sat Jan 29 14:29:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 36880 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 3A86427BBEA; Sat, 29 Jan 2022 14:31:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0620127BBE9 for ; Sat, 29 Jan 2022 14:31:10 +0000 (GMT) Received: from localhost ([::1]:37610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDokv-0005Sx-2m for patchwork@mira.cbaines.net; Sat, 29 Jan 2022 09:31:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDoko-0005Sp-Q6 for guix-patches@gnu.org; Sat, 29 Jan 2022 09:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDoko-0002hx-GV for guix-patches@gnu.org; Sat, 29 Jan 2022 09:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nDokn-00062R-Vh for guix-patches@gnu.org; Sat, 29 Jan 2022 09:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53623] [PATCH] gnu: mosh: Fix path to binaries. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Jan 2022 14:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53623@debbugs.gnu.org Cc: Michael Rohleder X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164346665623199 (code B ref -1); Sat, 29 Jan 2022 14:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jan 2022 14:30:56 +0000 Received: from localhost ([127.0.0.1]:32958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDoki-000627-FS for submit@debbugs.gnu.org; Sat, 29 Jan 2022 09:30:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:39714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDokg-00061w-IM for submit@debbugs.gnu.org; Sat, 29 Jan 2022 09:30:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDokg-0005SX-Ac for guix-patches@gnu.org; Sat, 29 Jan 2022 09:30:54 -0500 Received: from [2a01:488:42:1000:50ed:84e7::] (port=35580 helo=wp224.webpack.hosteurope.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDoke-0002hb-Pi for guix-patches@gnu.org; Sat, 29 Jan 2022 09:30:54 -0500 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1nDoka-00017U-UQ; Sat, 29 Jan 2022 15:30:48 +0100 Received: from [192.168.1.3] (helo=micha.rohleder.de) by www.rohleder.de with esmtp (Exim 4.94) (envelope-from ) id 1nDojV-0008KR-E2; Sat, 29 Jan 2022 15:30:48 +0100 From: Michael Rohleder Date: Sat, 29 Jan 2022 15:29:50 +0100 Message-Id: <20220129142950.26777-1-mike@rohleder.de> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1643466652;8cfd6e75; X-HE-SMSGID: 1nDoka-00017U-UQ X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:488:42:1000:50ed:84e7:: (failed) Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_PERMERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ssh.scm (mosh)[arguments]: Add substitution for mosh-server and -client. Remove unneeded 'wrap phase. --- For some reason setting $PATH in 'wrap phase doesn't work anymore, the perl script doesn't find it's binaries, so I substitute them there. gnu/packages/ssh.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4dd8bb6d96..c296029fc0 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2022 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -478,19 +479,15 @@ (define-public mosh '(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-FHS-file-names - (lambda _ - (substitute* "scripts/mosh.pl" - (("/bin/sh") - (which "sh"))) - #t)) - (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'mosh' can find 'mosh-client' and - ;; 'mosh-server'. (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (wrap-program (string-append bin "/mosh") - `("PATH" ":" prefix (,bin))))))))) + (substitute* "scripts/mosh.pl" + (("/bin/sh") (which "sh")) + (("\\$server = 'mosh-server'") + (string-append "$server = '" bin "/mosh-server'")) + (("\\$client = 'mosh-client'") + (string-append "$client = '" bin "/mosh-client'"))))))))) (native-inputs (list pkg-config)) (inputs