diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2017-01-28 20:06:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-28 20:06:49 -0500 |
| commit | 58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06 (patch) | |
| tree | 3ed873711f22f4478fc60bf771dfdcd502c34a6a /pkgs | |
| parent | 2f38d1fd1f24668e2faf50cec8fd7a5e413fb5ae (diff) | |
| parent | ad6b79fc9760c5a79c9504b28ff342df87fb6437 (diff) | |
| download | nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.tar nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.tar.gz nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.tar.bz2 nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.tar.lz nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.tar.xz nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.tar.zst nixlib-58dcda6b8c78366b73c39b6fcc2cbd0f13eefe06.zip | |
Merge pull request #22235 from aneeshusa/mosh-use-ssh-from-nixpkgs
mosh: use ssh from nixpkgs
Diffstat (limited to 'pkgs')
| -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 8a4f7e2dbe6c..7ef001971180 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 000000000000..cb2a650718ab --- /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; + |