diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-18 20:47:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 20:47:11 +0100 |
| commit | 4396baf04efd2fd1e0621d6c594324815e68c0a0 (patch) | |
| tree | 6462bc70ae0e2b8c3d580f5dcc15753425c613e9 /pkgs/tools | |
| parent | 533c150d18e5be562c0454f77259c30d3e2e9da9 (diff) | |
| parent | 9b18a0f353e7048fb0bf4cc60822a6da696b3821 (diff) | |
| download | nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.tar nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.tar.gz nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.tar.bz2 nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.tar.lz nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.tar.xz nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.tar.zst nixlib-4396baf04efd2fd1e0621d6c594324815e68c0a0.zip | |
Merge pull request #106876 from antifuchs/fix-mosh-client-path
mosh: Hermeticize mosh-client path reference from mosh.pl
Diffstat (limited to 'pkgs/tools')
| -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") + |