libdjinterop: 0.24.3 -> 0.26.1; fix aarch64-linux build (#422754)

* libdjinterop: 0.24.3 -> 0.26.1

Signed-off-by: Marcin Serwin <marcin@serwin.dev>

* libdjinterop: fix build on aarch64-linux

The vendored date.h library was too old.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>

---------

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
This commit is contained in:
Marcin Serwin 2025-07-08 16:16:20 +02:00 committed by GitHub
parent 64e0fc2c97
commit 9807714d69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 5 deletions

View File

@ -65,6 +65,12 @@ stdenv.mkDerivation rec {
hash = "sha256-dKk3n3KDindnLbON52SW5h4cz96WVi0OPjwA27HqQCI=";
};
# Should be removed when bumping to 2.6.x
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-warn "LIBDJINTEROP_VERSION 0.24.3" "LIBDJINTEROP_VERSION 0.26.1"
'';
nativeBuildInputs = [
cmake
pkg-config

View File

@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch2,
boost,
cmake,
ninja,
@ -10,18 +11,26 @@
zlib,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
name = "libdjinterop";
version = "unstable";
version = "0.26.1";
src = fetchFromGitHub {
owner = "xsco";
repo = "libdjinterop";
rev = "0.24.3";
hash = "sha256-Fp7AwEOq2JOpL60GDAXmA15ptFeLoG79nnnPXHl1Hjw=";
rev = finalAttrs.version;
hash = "sha256-HwNhCemqVR1xNSbcht0AuwTfpRhVi70ZH5ksSTSRFoc=";
};
patches = [
# https://github.com/xsco/libdjinterop/pull/161
(fetchpatch2 {
url = "https://github.com/xsco/libdjinterop/commit/94ce315cd5155bd031eeccfec12fbeb8e399dd14.patch";
hash = "sha256-WahMsFeetSlHHiIyaC04YxTiXDxD1ooASqoIP2TK9R0=";
})
];
nativeBuildInputs = [
cmake
ninja
@ -46,4 +55,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ benley ];
platforms = platforms.unix;
};
}
})