mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
mosh: use ssh from nixpkgs
This commit is contained in:
parent
781c79182e
commit
ad6b79fc97
@ -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
|
||||
'';
|
||||
|
13
pkgs/tools/networking/mosh/ssh_path.patch
Normal file
13
pkgs/tools/networking/mosh/ssh_path.patch
Normal file
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user