Merge pull request #129416 from nagy/avro-cpp1102

This commit is contained in:
Sandro 2022-02-21 23:57:52 +01:00 committed by GitHub
commit 804e15c51f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "avro-c++";
version = "1.8.2";
version = "1.10.2";
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k";
sha256 = "1qv2wxh5q2iq48m5g3xci9p05znzcl0v3314bhcsyr5bkpdjvzs1";
};
nativeBuildInputs = [ cmake python3 ];

View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, perl
, boost
, rdkafka
@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
makeFlags = [ "GEN_PKG_CONFIG=y" ];
patches = [
# Fix compatibility with Avro master branch
(fetchpatch {
url = "https://github.com/confluentinc/libserdes/commit/d7a355e712ab63ec77f6722fb5a9e8056e7416a2.patch";
sha256 = "14bdx075n4lxah63kp7phld9xqlz3pzs03yf3wbq4nmkgwac10dh";
})
];
postPatch = ''
patchShebangs configure lds-gen.pl
'';