2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 2f4edca7301c3..f9e07e5c5e5a0 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -57,8 +57,9 @@ stdenv.mkDerivation rec {
     # set monero-gui version
     substituteInPlace src/version.js.in \
        --replace '@VERSION_TAG_GUI@' '${version}'
-    substituteInPlace monero/src/version.cpp.in \
-      --replace '@VERSION_IS_RELEASE@' 'true'
+
+    # remove this line on the next release
+    rm cmake/Version.cmake
 
     # use monerod from the monero package
     substituteInPlace src/daemon/DaemonManager.cpp \
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 5b666e92ae8a4..935040bc7bb55 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , cmake, pkgconfig
 , boost, miniupnpc, openssl, unbound
 , zeromq, pcsclite, readline, libsodium, hidapi
@@ -27,7 +27,16 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  patches = [ ./use-system-libraries.patch ];
+  patches = [
+    ./use-system-libraries.patch
+
+    # This fixes a bug in the monero-gui build system,
+    # remove it once the PR has been merged
+    (fetchpatch {
+      url = "https://github.com/monero-project/monero/pull/6867.patch";
+      sha256 = "0nxa6861df1fadrm9bmhqf2g6mljgr4jndsbxqp7g501hv9z51j3";
+    })
+  ];
 
   postPatch = ''
     # remove vendored libraries