diff options
| author | Peter Simons <simons@cryp.to> | 2016-04-04 16:58:57 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-04-04 16:58:57 +0200 |
| commit | 84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad (patch) | |
| tree | c32ccd017aba1e26c8e596fc28bdaa78f06beca7 /pkgs | |
| parent | 3a75ed446410f84829aab648d38fda55f514e523 (diff) | |
| parent | 399d2bca32b5ddb0bed74c6acb96aee0ef598183 (diff) | |
| download | nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.tar nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.tar.gz nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.tar.bz2 nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.tar.lz nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.tar.xz nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.tar.zst nixlib-84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad.zip | |
Merge pull request #14441 from mayflower/fix/mosh
mosh: fix segfaulting issue
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index ec2f8d78dc67..80feeafdbca4 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl, openssl }: +, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { name = "mosh-1.2.5"; @@ -9,7 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s"; }; - buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + buildInputs = [ autoreconfHook boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + + patches = [ + # remove automake detection macro patch on next release as it is already on mosh master + (fetchpatch { + name = "fix_automake_detection_macro.patch"; + url = "https://github.com/mobile-shell/mosh/commit/a47917b97606a03f6bbf0cafd1fcd495b0229790.patch"; + sha256 = "0ib200ffvbnns125xd58947fyxdx31m06rmnzqmxpxcnjza7k404"; + }) + ]; postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB |