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

Merge pull request #60419 from dtzWill/fix/mosh-llvm7

Browse Source 
mosh: upstream patch to fix w/newer clang/libcxx (c++17)
This commit is contained in:
Matthew Bauer 2019-05-31 20:59:48 -04:00 committed by GitHub
commit 01390dcef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkgconfig
, makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion
, libutempter ? null, withUtempter ? stdenv.isLinux }: , libutempter ? null, withUtempter ? stdenv.isLinux }:
@ -15,7 +15,15 @@ stdenv.mkDerivation rec {
++ (with perlPackages; [ perl IOTty ]) ++ (with perlPackages; [ perl IOTty ])
++ lib.optional withUtempter libutempter; ++ lib.optional withUtempter libutempter;
patches = [ ./ssh_path.patch ./utempter_path.patch ]; patches = [
./ssh_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";
})
];
postPatch = '' postPatch = ''
substituteInPlace scripts/mosh.pl \ substituteInPlace scripts/mosh.pl \
--subst-var-by ssh "${openssh}/bin/ssh" --subst-var-by ssh "${openssh}/bin/ssh"

4
pkgs/top-level/all-packages.nix
View File

@ -4616,9 +4616,7 @@ in
docbook-xsl = docbook_xsl; docbook-xsl = docbook_xsl;
}; };
mosh = callPackage ../tools/networking/mosh { mosh = callPackage ../tools/networking/mosh { };
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
motuclient = callPackage ../applications/science/misc/motu-client { }; motuclient = callPackage ../applications/science/misc/motu-client { };