diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-29 07:55:56 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-04-29 08:03:16 -0500 |
| commit | 208fbe20ad05098d42457cb81b1cbddd67bd4509 (patch) | |
| tree | d18f50d33d1d4f2055b0c56e01819ebb005eb30c | |
| parent | a76e11a8c509f2db5871aced41b46077b66206a2 (diff) | |
mosh: upstream patch to fix w/newer clang/libcxx (c++17)
Remove special-casing no longer needed.
| -rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 9f81e0d57211f..98d2625aade9f 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -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 , libutempter ? null, withUtempter ? stdenv.isLinux }: @@ -15,7 +15,15 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOTty ]) ++ 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 = '' substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daf9dd2a8b15b..c290d549e7929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4486,9 +4486,7 @@ in docbook-xsl = docbook_xsl; }; - mosh = callPackage ../tools/networking/mosh { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; + mosh = callPackage ../tools/networking/mosh { }; motuclient = callPackage ../applications/science/misc/motu-client { }; |