From bb5fee8d67312323c26b94fae8e50046ffd84c28 Mon Sep 17 00:00:00 2001 From: Jose Storopoli Date: Thu, 18 Apr 2024 04:51:30 -0300 Subject: [PATCH] fix: darwin builds and shell aliases - Fixes darwin builds by disabling `bitcoind` tests and checks (just compile please) - Makes the aliases robust to use the `bin/` directory from the pkg itself --- flake.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index fb5cad0..02a8f7e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ let flakeboxLib = flakebox.lib.${system} { }; pkgs = import nixpkgs { inherit system; }; + bitcoind = pkgs.bitcoind.overrideDerivation (oldAttrs: { doCheck = false; doInstallCheck = false; }); cashu_rs_mint_dir = "/tmp/cashu-rs-mint"; bitcoin_dir = cashu_rs_mint_dir + "/bitcoin"; @@ -26,7 +27,7 @@ devShells = flakeboxLib.mkShells { buildInputs = [ pkgs.clightning - pkgs.bitcoind + bitcoind ]; shellHook = '' @@ -34,9 +35,9 @@ mkdir -p ${bitcoin_dir} mkdir -p ${lightning_dir} - alias btc="bitcoin-cli -regtest -datadir=${bitcoin_dir}" - alias ln1="lightning-cli --lightning-dir=${lightning_dir}/ln_1 --regtest" - alias ln2="lightning-cli --lightning-dir=${lightning_dir}/ln_2 --regtest" + alias btc="${bitcoind}/bin/bitcoin-cli -regtest -datadir=${bitcoin_dir}" + alias ln1="${pkgs.clightning}/bin/lightning-cli --lightning-dir=${lightning_dir}/ln_1 --regtest" + alias ln2="${pkgs.clightning}/bin/lightning-cli --lightning-dir=${lightning_dir}/ln_2 --regtest" blockcount=$(btc getblockcount) || { blockcount=-1; }