pyrox.dev
mosh: use ssh from nixpkgs
+7
-1
pkgs/tools/networking/mosh/default.nix
+7
-1
pkgs/tools/networking/mosh/default.nix
···
1
1
{ stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty
2
-
, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }:
2
+
, makeWrapper, perl, openssl, autoreconfHook, openssh }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
name = "mosh-1.2.6";
···
10
10
};
11
11
12
12
buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
13
+
14
+
patches = [ ./ssh_path.patch ];
15
+
postPatch = ''
16
+
substituteInPlace scripts/mosh.pl \
17
+
--subst-var-by ssh "${openssh}/bin/ssh"
18
+
'';
13
19
14
20
postInstall = ''
15
21
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
+13
pkgs/tools/networking/mosh/ssh_path.patch
+13
pkgs/tools/networking/mosh/ssh_path.patch
···
1
+
diff --git i/scripts/mosh.pl w/scripts/mosh.pl
2
+
index c511482..55bf5f3 100755
3
+
--- i/scripts/mosh.pl
4
+
+++ w/scripts/mosh.pl
5
+
@@ -66,7 +66,7 @@ my $use_remote_ip = 'proxy';
6
+
my $family = 'prefer-inet';
7
+
my $port_request = undef;
8
+
9
+
-my @ssh = ('ssh');
10
+
+my @ssh = ('@ssh@');
11
+
12
+
my $term_init = 1;
13
+