swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

mosh: build with latest protobuf

Browse source
This commit is contained in:
Yureka 2023-09-16 01:21:50 +02:00
parent 48c5ac5ce0
commit fd2b5eec41
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/networking/mosh/default.nix
View file

@ -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)";

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

@ -10918,9 +10918,7 @@ with pkgs;
electron = electron_22;
};
mosh = callPackage ../tools/networking/mosh {
protobuf = protobuf3_21;
};
mosh = callPackage ../tools/networking/mosh { };
motrix = callPackage ../tools/networking/motrix { };