summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2018-03-12 04:06:06 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2018-03-12 04:07:18 +0400
commit876420f04e4d29ed16c2e43774fab6e000526dfa (patch)
tree80f61452c67a943077ba3c79135fb341a67bee95
parente31f49f6719b24e0e5000a36a5c958bc25bf066c (diff)
downloadnixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.tar
nixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.tar.gz
nixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.tar.bz2
nixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.tar.lz
nixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.tar.xz
nixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.tar.zst
nixlib-876420f04e4d29ed16c2e43774fab6e000526dfa.zip
bitcoin-unlimited: fix build with boost 1.66
Use part of fix for mainline bitcoin:
https://github.com/bitcoin/bitcoin/commit/1ec0c0a01c316146434642ab2f14a7367306dbec

Also enable parallel builds for speed.
-rw-r--r--pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch38
-rw-r--r--pkgs/applications/altcoins/bitcoin-unlimited.nix5
2 files changed, 43 insertions, 0 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
new file mode 100644
index 000000000000..1b74a48a84aa
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-unlimited-const-comparators.patch
@@ -0,0 +1,38 @@
+--- a/src/txmempool.h
++++ b/src/txmempool.h
+@@ -204,7 +204,7 @@
+ class CompareTxMemPoolEntryByDescendantScore
+ {
+ public:
+-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+     {
+         bool fUseADescendants = UseDescendantScore(a);
+         bool fUseBDescendants = UseDescendantScore(b);
+@@ -226,7 +226,7 @@
+     }
+ 
+     // Calculate which score to use for an entry (avoiding division).
+-    bool UseDescendantScore(const CTxMemPoolEntry &a)
++    bool UseDescendantScore(const CTxMemPoolEntry &a) const
+     {
+         double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
+         double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
+@@ -241,7 +241,7 @@
+ class CompareTxMemPoolEntryByScore
+ {
+ public:
+-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+     {
+         double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
+         double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
+@@ -255,7 +255,7 @@
+ class CompareTxMemPoolEntryByEntryTime
+ {
+ public:
+-    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
++    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
+     {
+         return a.GetTime() < b.GetTime();
+     }
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 9eb1e54b9093..23d9e63459ab 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -21,8 +21,13 @@ stdenv.mkDerivation rec {
                   miniupnpc utillinux protobuf libevent ]
                   ++ optionals withGui [ qt4 qrencode ];
 
+  patches = [
+    ./bitcoin-unlimited-const-comparators.patch
+  ];
+
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
+  enableParallelBuilding = true;
 
   meta = {
     description = "Peer-to-peer electronic cash system (Unlimited client)";