diff options
| -rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/networking/mosh/mosh-client_path.patch | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 4294e9a77784..b03678858ad0 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -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"; diff --git a/pkgs/tools/networking/mosh/mosh-client_path.patch b/pkgs/tools/networking/mosh/mosh-client_path.patch new file mode 100644 index 000000000000..327fb7af9260 --- /dev/null +++ b/pkgs/tools/networking/mosh/mosh-client_path.patch @@ -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") + |