summary refs log tree commit diff
path: root/pkgs/applications/blockchains/monero
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2020-10-08 01:12:31 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2020-10-08 01:12:31 +0200
commitb5ca332b1db0e3bfcb1bdc119b37e2500ec8259b (patch)
tree9372147203d8a352e1084c1235463fbb3b546cdb /pkgs/applications/blockchains/monero
parent059292cc64d241fd8196db82423d8d195b57904e (diff)
downloadnixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.tar
nixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.tar.gz
nixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.tar.bz2
nixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.tar.lz
nixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.tar.xz
nixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.tar.zst
nixpkgs-b5ca332b1db0e3bfcb1bdc119b37e2500ec8259b.zip
monero: apply patch to fix monero-gui build
This is a more appropriate solution to fix a
build error in monero-gui.
Diffstat (limited to 'pkgs/applications/blockchains/monero')
-rw-r--r--pkgs/applications/blockchains/monero/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 5b666e92ae8..935040bc7bb 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