Skip to content

Commit 9807714

Browse files
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>
1 parent 64e0fc2 commit 9807714

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

pkgs/applications/audio/mixxx/default.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ stdenv.mkDerivation rec {
6565
hash = "sha256-dKk3n3KDindnLbON52SW5h4cz96WVi0OPjwA27HqQCI=";
6666
};
6767

68+
# Should be removed when bumping to 2.6.x
69+
postPatch = ''
70+
substituteInPlace CMakeLists.txt \
71+
--replace-warn "LIBDJINTEROP_VERSION 0.24.3" "LIBDJINTEROP_VERSION 0.26.1"
72+
'';
73+
6874
nativeBuildInputs = [
6975
cmake
7076
pkg-config

pkgs/by-name/li/libdjinterop/package.nix

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
fetchpatch2,
56
boost,
67
cmake,
78
ninja,
@@ -10,18 +11,26 @@
1011
zlib,
1112
}:
1213

13-
stdenv.mkDerivation {
14+
stdenv.mkDerivation (finalAttrs: {
1415
name = "libdjinterop";
1516

16-
version = "unstable";
17+
version = "0.26.1";
1718

1819
src = fetchFromGitHub {
1920
owner = "xsco";
2021
repo = "libdjinterop";
21-
rev = "0.24.3";
22-
hash = "sha256-Fp7AwEOq2JOpL60GDAXmA15ptFeLoG79nnnPXHl1Hjw=";
22+
rev = finalAttrs.version;
23+
hash = "sha256-HwNhCemqVR1xNSbcht0AuwTfpRhVi70ZH5ksSTSRFoc=";
2324
};
2425

26+
patches = [
27+
# https://github.com/xsco/libdjinterop/pull/161
28+
(fetchpatch2 {
29+
url = "https://github.com/xsco/libdjinterop/commit/94ce315cd5155bd031eeccfec12fbeb8e399dd14.patch";
30+
hash = "sha256-WahMsFeetSlHHiIyaC04YxTiXDxD1ooASqoIP2TK9R0=";
31+
})
32+
];
33+
2534
nativeBuildInputs = [
2635
cmake
2736
ninja
@@ -46,4 +55,4 @@ stdenv.mkDerivation {
4655
maintainers = with maintainers; [ benley ];
4756
platforms = platforms.unix;
4857
};
49-
}
58+
})

0 commit comments

Comments
 (0)