From 848c4c6eda77ecfdf74bb18bc6b37636cff2fc97 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 16 Oct 2020 17:43:13 +0200
Subject: [PATCH] joinmarket: add variable 'bitcoind'

---
 modules/joinmarket.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 752c0dc..f534750 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -7,6 +7,7 @@ let
   inherit (config) nix-bitcoin-services;
   secretsDir = config.nix-bitcoin.secretsDir;
 
+  inherit (config.services) bitcoind;
   torAddress = builtins.head (builtins.split ":" config.services.tor.client.socksListenAddress);
   configFile = builtins.toFile "config" ''
     # Based on https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/jmclient/jmclient/configure.py
@@ -19,9 +20,9 @@ let
     [BLOCKCHAIN]
     blockchain_source = bitcoin-rpc
     network = mainnet
-    rpc_host = ${builtins.elemAt config.services.bitcoind.rpcbind 0}
+    rpc_host = ${builtins.elemAt bitcoind.rpcbind 0}
     rpc_port = 8332
-    rpc_user = ${config.services.bitcoind.rpc.users.privileged.name}
+    rpc_user = ${bitcoind.rpc.users.privileged.name}
     @@RPC_PASSWORD@@
 
     [MESSAGING:server1]