Skip to content

Commit d33993d

Browse files
authored
heaptrack: add patch for GCC 14, unpin Boost (#358970)
2 parents 155a2f6 + d2b9577 commit d33993d

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

pkgs/development/tools/profiling/heaptrack/default.nix

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
lib, stdenv, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, makeBinaryWrapper,
3-
zlib, boost179, libunwind, elfutils, sparsehash, zstd,
2+
lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules, makeBinaryWrapper,
3+
zlib, boost, libunwind, elfutils, sparsehash, zstd,
44
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
55
}:
66

@@ -15,9 +15,17 @@ mkDerivation rec {
1515
hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU=";
1616
};
1717

18+
patches = [
19+
# cmake: Fix C compatibility of libunwind probes
20+
(fetchpatch {
21+
url = "https://invent.kde.org/sdk/heaptrack/-/commit/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch";
22+
hash = "sha256-eou53UUQX+S7yrz2RS95GwkAnNIZY/aaze0eAdjnbPU=";
23+
})
24+
];
25+
1826
nativeBuildInputs = [ cmake extra-cmake-modules makeBinaryWrapper ];
1927
buildInputs = [
20-
zlib boost179 libunwind sparsehash zstd
28+
zlib boost libunwind sparsehash zstd
2129
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
2230
] ++ lib.optionals stdenv.hostPlatform.isLinux [
2331
elfutils

0 commit comments

Comments
 (0)