From 46e8aa0a08a2393472963397b7cc8da6b876d9a7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 21:11:36 +0800 Subject: [PATCH] tmate: use msgpack-c instead of msgpack --- pkgs/tools/misc/tmate/default.nix | 44 ++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 76a2afcfb6b..1956f25fb97 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config -, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, cmake +, libtool +, pkg-config +, zlib +, openssl +, libevent +, ncurses +, ruby +, msgpack-c +, libssh +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tmate"; version = "unstable-2022-08-07"; @@ -12,10 +25,29 @@ stdenv.mkDerivation rec { sha256 = "sha256-t96gfmAMcsjkGf8pvbEx2fNx4Sj3W6oYoQswB3Dklb8="; }; - dontUseCmakeConfigure = true; + postPatch = '' + substituteInPlace configure.ac \ + --replace 'msgpack >= 1.1.0' 'msgpack-c >= 1.1.0' + ''; - buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + cmake + pkg-config + ]; + + buildInputs = [ + libtool + zlib + openssl + libevent + ncurses + ruby + msgpack-c + libssh + ]; + + dontUseCmakeConfigure = true; meta = with lib; { homepage = "https://tmate.io/";