Merge pull request #106876 from antifuchs/fix-mosh-client-path

mosh: Hermeticize mosh-client path reference from mosh.pl
This commit is contained in:
Sandro 2021-01-18 20:47:11 +01:00 committed by GitHub
commit 4396baf04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
patches = [
./ssh_path.patch
./mosh-client_path.patch
./utempter_path.patch
# Fix w/c++17, ::bind vs std::bind
(fetchpatch {
@ -32,6 +33,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace scripts/mosh.pl \
--subst-var-by ssh "${openssh}/bin/ssh"
substituteInPlace scripts/mosh.pl \
--subst-var-by mosh-client "$out/bin/mosh-client"
'';
configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter";

View File

@ -0,0 +1,22 @@
diff --git a/scripts/mosh.pl b/scripts/mosh.pl
index 56e96d7..2a2177e 100755
--- a/scripts/mosh.pl
+++ b/scripts/mosh.pl
@@ -61,7 +61,7 @@ my $have_ipv6 = eval {
$|=1;
-my $client = 'mosh-client';
+my $client = '@mosh-client@';
my $server = 'mosh-server';
my $predict = undef;
@@ -91,7 +91,7 @@ my @cmdline = @ARGV;
my $usage =
qq{Usage: $0 [options] [--] [user@]host [command...]
--client=PATH mosh client on local machine
- (default: "mosh-client")
+ (default: "@mosh-client@")
--server=COMMAND mosh server on remote machine
(default: "mosh-server")