diff options
author | Yureka <yuka@yuka.dev> | 2023-09-16 01:21:50 +0200 |
---|---|---|
committer | Yureka <yuka@yuka.dev> | 2023-09-16 03:19:07 +0200 |
commit | fd2b5eec41baa276207f132547f5562e97359a38 (patch) | |
tree | 4643eb3bd39c6e8c9d89f3c9b0046c3a91f7a65f /pkgs/tools/networking/mosh | |
parent | 48c5ac5ce0a143aeec468db6a27c25e4a9de52a3 (diff) |
mosh: build with latest protobuf
Diffstat (limited to 'pkgs/tools/networking/mosh')
-rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index a89fd79f6726e..7a19275e4e2ab 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config -, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion +, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion, fetchpatch , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: stdenv.mkDerivation rec { @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { ./mosh-client_path.patch # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch + + # Fixes build with protobuf3 23.x + (fetchpatch { + url = "https://github.com/mobile-shell/mosh/commit/eee1a8cf413051c2a9104e8158e699028ff56b26.patch"; + hash = "sha256-CouLHWSsyfcgK3k7CvTK3FP/xjdb1pfsSXYYQj3NmCQ="; + }) ]; postPatch = '' @@ -41,8 +47,6 @@ stdenv.mkDerivation rec { 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)"; |