monero-cli: fix build issue with GCC14 (NixOS#367932)

bhipple · Dec 26, 2024 · d6678a7 · d6678a7
2 parents 308f45a + 45cd7cf
commit d6678a7
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   pkg-config,
   boost,
@@ -40,7 +41,6 @@ let
     rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0";
     hash = "sha256-VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI=";
   };
-
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
@@ -53,7 +53,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM=";
   };
 
-  patches = [ ./use-system-libraries.patch ];
+  patches = [
+    ./use-system-libraries.patch
+    # https://github.com/monero-project/monero/pull/9462
+    (fetchpatch2 {
+      url = "https://github.com/monero-project/monero/commit/65568d3a884857ce08d1170f5801a6891a5c187c.patch?full_index=1";
+      hash = "sha256-Btuy69y02UyVMmsOiCRPZhM7qW5+FRNujOZjNMRdACQ=";
+    })
+  ];
 
   postPatch = ''
     # manually install submodules
@@ -91,9 +98,7 @@ stdenv.mkDerivation rec {
       libusb1
       protobuf_21
     ]
-    ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [
-      udev
-    ];
+    ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ];
 
   cmakeFlags =
     [