diff options
| author | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-01-28 13:21:24 -0500 |
|---|---|---|
| committer | Aneesh Agrawal <aneeshusa@gmail.com> | 2017-01-28 13:21:24 -0500 |
| commit | ad6b79fc9760c5a79c9504b28ff342df87fb6437 (patch) | |
| tree | fe1f7bf1cf2df1a176c1db2a555890ba782d23c7 /pkgs/tools/networking/mosh | |
| parent | 781c79182e6939a7e5e6d9ecd15a400ec94e2ae5 (diff) | |
| download | nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.tar nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.tar.gz nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.tar.bz2 nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.tar.lz nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.tar.xz nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.tar.zst nixpkgs-ad6b79fc9760c5a79c9504b28ff342df87fb6437.zip | |
mosh: use ssh from nixpkgs
Diffstat (limited to 'pkgs/tools/networking/mosh')
| -rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/mosh/ssh_path.patch | 13 |
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 8a4f7e2dbe6..7ef00197118 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: +, makeWrapper, perl, openssl, autoreconfHook, openssh }: stdenv.mkDerivation rec { name = "mosh-1.2.6"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + patches = [ ./ssh_path.patch ]; + postPatch = '' + substituteInPlace scripts/mosh.pl \ + --subst-var-by ssh "${openssh}/bin/ssh" + ''; + postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/pkgs/tools/networking/mosh/ssh_path.patch new file mode 100644 index 00000000000..cb2a650718a --- /dev/null +++ b/pkgs/tools/networking/mosh/ssh_path.patch @@ -0,0 +1,13 @@ +diff --git i/scripts/mosh.pl w/scripts/mosh.pl +index c511482..55bf5f3 100755 +--- i/scripts/mosh.pl ++++ w/scripts/mosh.pl +@@ -66,7 +66,7 @@ my $use_remote_ip = 'proxy'; + my $family = 'prefer-inet'; + my $port_request = undef; + +-my @ssh = ('ssh'); ++my @ssh = ('@ssh@'); + + my $term_init = 1; + |