summary refs log tree commit diff
diff options
context:
space:
mode:
authorRussell O'Connor <roconnor@theorem.ca>2018-01-08 20:29:43 -0500
committerVincent Laporte <vbgl@users.noreply.github.com>2018-01-12 23:54:52 +0100
commit6887a0fc9a802331a2d77b499f9692548899c84c (patch)
tree97590d5cec237c14c82b9d715641f8595aedf4a4
parent403ee9691adf76105096a8df4d4b3912ba11b5ce (diff)
downloadnixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.tar
nixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.tar.gz
nixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.tar.bz2
nixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.tar.lz
nixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.tar.xz
nixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.tar.zst
nixpkgs-6887a0fc9a802331a2d77b499f9692548899c84c.zip
bitcoin: fix boost dependency
Bitcoin 0.15.1 doesn't build with boost 1.66.
I'm hesitant to apply untested patches to software like Bitcoin.
Instead I'm forcing the boost dependency to version 1.64 (which is the version listed @
https://github.com/bitcoin/bitcoin/blob/45173fa6fca9537abb0a0554f731d14b9f89c456/doc/dependencies.md).

Nothing in applications/altcoins/default.nix was using the boost162 parameter, so I've replaced it with the boost164 parameter.
-rw-r--r--pkgs/applications/altcoins/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 21c6b134114..7d834be5da8 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,11 +1,11 @@
-{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
+{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
 
 rec {
 
   aeon = callPackage ./aeon { };
 
-  bitcoin  = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; };
-  bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; };
+  bitcoin  = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; };
+  bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; };
 
   bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
   bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };