pyrox.dev
mosh: build with latest protobuf
+7
-3
pkgs/tools/networking/mosh/default.nix
+7
-3
pkgs/tools/networking/mosh/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, zlib, protobuf, ncurses, pkg-config
2
-
, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion
2
+
, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion, fetchpatch
3
3
, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }:
4
4
5
5
stdenv.mkDerivation rec {
···
26
26
./mosh-client_path.patch
27
27
# Fix build with bash-completion 2.10
28
28
./bash_completion_datadir.patch
29
+
30
+
# Fixes build with protobuf3 23.x
31
+
(fetchpatch {
32
+
url = "https://github.com/mobile-shell/mosh/commit/eee1a8cf413051c2a9104e8158e699028ff56b26.patch";
33
+
hash = "sha256-CouLHWSsyfcgK3k7CvTK3FP/xjdb1pfsSXYYQj3NmCQ=";
34
+
})
29
35
];
30
36
31
37
postPatch = ''
···
40
46
postInstall = ''
41
47
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
42
48
'';
43
-
44
-
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
45
49
46
50
meta = with lib; {
47
51
homepage = "https://mosh.org/";
+1
-3
pkgs/top-level/all-packages.nix
+1
-3
pkgs/top-level/all-packages.nix
···
10918
10918
electron = electron_22;
10919
10919
};
10920
10920
10921
-
mosh = callPackage ../tools/networking/mosh {
10922
-
protobuf = protobuf3_21;
10923
-
};
10921
+
mosh = callPackage ../tools/networking/mosh { };
10924
10922
10925
10923
motrix = callPackage ../tools/networking/motrix { };
10926
10924