JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22235 from aneeshusa/mosh-use-ssh-from-nixpkgs

Browse Source 
mosh: use ssh from nixpkgs
This commit is contained in:
Tim Steinbach 2017-01-28 20:06:49 -05:00 committed by GitHub
commit 58dcda6b8c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/mosh/default.nix
View File

@ -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
View 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;