summary refs log tree commit diff
path: root/pkgs/applications/altcoins
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-05-10 09:30:56 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-05-10 09:30:56 +0200
commit64c8c6dcb3da69616fd4c26ae013e6ab88be9779 (patch)
tree823d029b5a9c0698a9c10c4962ef425456db19be /pkgs/applications/altcoins
parent7d8e16d93905b95975daf09945621eb75051e30d (diff)
parent67a8c66f68d9703cd2bf0a706c683de6c362f0d8 (diff)
downloadnixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.tar
nixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.tar.gz
nixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.tar.bz2
nixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.tar.lz
nixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.tar.xz
nixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.tar.zst
nixpkgs-64c8c6dcb3da69616fd4c26ae013e6ab88be9779.zip
Merge master into staging
Diffstat (limited to 'pkgs/applications/altcoins')
-rw-r--r--pkgs/applications/altcoins/monero/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 8be24522f56..cbba1ecba14 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
+{ stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline
 , CoreData, IOKit, PCSC
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig git ];
 
+  patches = [
+    # fix daemon crash, remove with 0.12.1.0 update
+    (fetchpatch {
+      url    = "https://github.com/monero-project/monero/commit/08343ab.diff";
+      sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
+    })
+  ];
+
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline