Merge pull request #240698 from doronbehar/pkg/coeurl-build-fix

coeurl: Add upstream commits that fix build
This commit is contained in:
Doron Behar 2023-06-30 10:50:43 +00:00 committed by GitHub
commit 6c672924c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, ninja
, pkg-config
, meson
@ -20,6 +21,22 @@ stdenv.mkDerivation rec {
rev = "v${version}";
hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w=";
};
patches = [
# Fix compatibility issues with curl > 7.85, see:
# https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a
# PATCH CAN BE REMOVED AFTER 0.3.0
(fetchpatch {
url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch";
hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY=";
})
# Fix error when building with fmt >= 10, see:
# https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc
# PATCH CAN BE REMOVED AFTER 0.3.0
(fetchpatch {
url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch";
hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w=";
})
];
nativeBuildInputs = [ ninja pkg-config meson ];