uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
19
pkgs/tools/networking/mosh/bash_completion_datadir.patch
Normal file
19
pkgs/tools/networking/mosh/bash_completion_datadir.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 3ad983d..ff8ff96 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread],
|
||||
|
||||
# Bash completion needs to ask where it goes if >= 2.0 is installed.
|
||||
AS_IF([test "$install_completion" != no],
|
||||
- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
|
||||
- [if test "$prefix" = "NONE"; then
|
||||
- completions="`pkg-config --variable=completionsdir bash-completion`"
|
||||
- else
|
||||
- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`"
|
||||
- fi],
|
||||
- [completions="${sysconfdir}/bash_completion.d"])
|
||||
+ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"]
|
||||
AC_SUBST([completions])])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
73
pkgs/tools/networking/mosh/default.nix
Normal file
73
pkgs/tools/networking/mosh/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config
|
||||
, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion
|
||||
, withUtempter ? stdenv.isLinux, libutempter }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mosh";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mosh.org/mosh-${version}.tar.gz";
|
||||
sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ];
|
||||
buildInputs = [ protobuf ncurses zlib openssl bash-completion perl ]
|
||||
++ lib.optional withUtempter libutempter;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [
|
||||
./ssh_path.patch
|
||||
./mosh-client_path.patch
|
||||
./utempter_path.patch
|
||||
# Fix w/c++17, ::bind vs std::bind
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch";
|
||||
sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm";
|
||||
})
|
||||
# Fix build with bash-completion 2.10
|
||||
./bash_completion_datadir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix build with Xcode 12.5 toolchain/case-insensitive filesystems
|
||||
# Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538;
|
||||
# remove on next upstream release.
|
||||
patch -p0 < ${fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff";
|
||||
sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd";
|
||||
}}
|
||||
|
||||
substituteInPlace scripts/mosh.pl \
|
||||
--subst-var-by ssh "${openssh}/bin/ssh" \
|
||||
--subst-var-by mosh-client "$out/bin/mosh-client"
|
||||
'';
|
||||
|
||||
configureFlags = [ "--enable-completion" ]
|
||||
++ lib.optional withUtempter "--with-utempter";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
|
||||
'';
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mosh.org/";
|
||||
description = "Mobile shell (ssh replacement)";
|
||||
longDescription = ''
|
||||
Remote terminal application that allows roaming, supports intermittent
|
||||
connectivity, and provides intelligent local echo and line editing of
|
||||
user keystrokes.
|
||||
|
||||
Mosh is a replacement for SSH. It's more robust and responsive,
|
||||
especially over Wi-Fi, cellular, and long-distance links.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ viric SuperSandro2000 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
22
pkgs/tools/networking/mosh/mosh-client_path.patch
Normal file
22
pkgs/tools/networking/mosh/mosh-client_path.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/scripts/mosh.pl b/scripts/mosh.pl
|
||||
index 56e96d7..2a2177e 100755
|
||||
--- a/scripts/mosh.pl
|
||||
+++ b/scripts/mosh.pl
|
||||
@@ -61,7 +61,7 @@ my $have_ipv6 = eval {
|
||||
|
||||
$|=1;
|
||||
|
||||
-my $client = 'mosh-client';
|
||||
+my $client = '@mosh-client@';
|
||||
my $server = 'mosh-server';
|
||||
|
||||
my $predict = undef;
|
||||
@@ -91,7 +91,7 @@ my @cmdline = @ARGV;
|
||||
my $usage =
|
||||
qq{Usage: $0 [options] [--] [user@]host [command...]
|
||||
--client=PATH mosh client on local machine
|
||||
- (default: "mosh-client")
|
||||
+ (default: "@mosh-client@")
|
||||
--server=COMMAND mosh server on remote machine
|
||||
(default: "mosh-server")
|
||||
|
||||
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;
|
||||
|
||||
14
pkgs/tools/networking/mosh/utempter_path.patch
Normal file
14
pkgs/tools/networking/mosh/utempter_path.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff -ur mosh-1.3.2/src/frontend/mosh-server.cc mosh-1.3.2.patched/src/frontend/mosh-server.cc
|
||||
--- mosh-1.3.2/src/frontend/mosh-server.cc 2017-07-22 23:14:53.000000000 +0200
|
||||
+++ mosh-1.3.2.patched/src/frontend/mosh-server.cc 2018-06-06 10:45:50.725352804 +0200
|
||||
@@ -351,6 +351,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#ifdef HAVE_UTEMPTER
|
||||
+ utempter_set_helper( "utempter" );
|
||||
+#endif
|
||||
+
|
||||
try {
|
||||
return run_server( desired_ip, desired_port, command_path, command_argv, colors, verbose, with_motd );
|
||||
} catch ( const Network::NetworkException &e ) {
|
||||
Loading…
Add table
Add a link
Reference in a new issue