Skip to content

Commit d6678a7

Browse files
authored
monero-cli: fix build issue with GCC14 (#367932)
2 parents 308f45a + 45cd7cf commit d6678a7

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

pkgs/applications/blockchains/monero-cli/default.nix

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
fetchpatch2,
56
cmake,
67
pkg-config,
78
boost,
@@ -40,7 +41,6 @@ let
4041
rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0";
4142
hash = "sha256-VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI=";
4243
};
43-
4444
in
4545
stdenv.mkDerivation rec {
4646
pname = "monero-cli";
@@ -53,7 +53,14 @@ stdenv.mkDerivation rec {
5353
hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM=";
5454
};
5555

56-
patches = [ ./use-system-libraries.patch ];
56+
patches = [
57+
./use-system-libraries.patch
58+
# https://github.com/monero-project/monero/pull/9462
59+
(fetchpatch2 {
60+
url = "https://github.com/monero-project/monero/commit/65568d3a884857ce08d1170f5801a6891a5c187c.patch?full_index=1";
61+
hash = "sha256-Btuy69y02UyVMmsOiCRPZhM7qW5+FRNujOZjNMRdACQ=";
62+
})
63+
];
5764

5865
postPatch = ''
5966
# manually install submodules
@@ -91,9 +98,7 @@ stdenv.mkDerivation rec {
9198
libusb1
9299
protobuf_21
93100
]
94-
++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [
95-
udev
96-
];
101+
++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ];
97102

98103
cmakeFlags =
99104
[

0 commit comments

Comments
 (0)