From: Michael Rohleder <mike@rohleder.de>
To: 53623@debbugs.gnu.org
Cc: Michael Rohleder <mike@rohleder.de>
Subject: [bug#53623] [PATCH] gnu: mosh: Fix path to binaries.
Date: Sat, 29 Jan 2022 15:29:50 +0100 [thread overview]
Message-ID: <20220129142950.26777-1-mike@rohleder.de> (raw)
* 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 <go.wigust@gmail.com>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;;
;;; 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
--
2.34.0
next reply other threads:[~2022-01-29 14:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-29 14:29 Michael Rohleder [this message]
2022-01-29 21:02 ` [bug#53623] [PATCH] gnu: mosh: Fix path to binaries Leo Famulari
2022-01-29 22:27 ` Thiago Jung Bauermann via Guix-patches via
2022-01-30 10:14 ` Michael Rohleder
2022-01-30 18:35 ` Leo Famulari
2022-01-30 18:44 ` Michael Rohleder
2022-01-30 19:10 ` Leo Famulari
2022-01-30 22:32 ` Thiago Jung Bauermann via Guix-patches via
2022-03-06 21:39 ` Ludovic Courtès
2022-03-07 8:54 ` Michael Rohleder
2022-03-07 20:23 ` bug#53623: " Ludovic Courtès
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220129142950.26777-1-mike@rohleder.de \
--to=mike@rohleder.de \
--cc=53623@debbugs.gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.