Nix improvements

.envrc

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
+fi
+
+watch_file rust-toolchain.toml
+use flake

.gitignore

@@ -5,3 +5,4 @@ target
 *~
 *.pyc
 result
+.direnv

flake.nix

@@ -20,26 +20,37 @@
     flake-utils.lib.eachDefaultSystem
       (system:
         let
-          overlays = [ (import rust-overlay) ];
+          overlays = [
+            (import rust-overlay)
+            (import ./rocksdb-overlay.nix)
+          ];
           pkgs = import nixpkgs {
             inherit system overlays;
           };
           rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
           craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
 
-          src = craneLib.cleanCargoSource ./.; 
+          src = craneLib.cleanCargoSource ./.;
 
           nativeBuildInputs = with pkgs; [ rustToolchain clang ]; # required only at build time
           buildInputs = with pkgs; [ ]; # also required at runtime
 
-          commonArgs = {
-            inherit src buildInputs nativeBuildInputs;
+          envVars = {
             LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
             ELEMENTSD_SKIP_DOWNLOAD = true;
             BITCOIND_SKIP_DOWNLOAD = true;
             ELECTRUMD_SKIP_DOWNLOAD = true;
+
+            # link rocksdb dynamically
+            ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
+            ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
           };
+
+          commonArgs = {
+            inherit src buildInputs nativeBuildInputs;
+          } // envVars;
+
           cargoArtifacts = craneLib.buildDepsOnly commonArgs;
           bin = craneLib.buildPackage (commonArgs // {
             inherit cargoArtifacts;
@@ -55,7 +66,6 @@
             doCheck = false;
           });
 
-
         in
         with pkgs;
         {
@@ -76,11 +86,9 @@
             program = "${bin}/bin/electrs";
           };
 
-
-          devShells.default = mkShell {
+          devShells.default = mkShell (envVars // {
             inputsFrom = [ bin ];
-            LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; # for rocksdb
-          };
+          });
         }
       );
 }

rocksdb-overlay.nix

@@ -0,0 +1,13 @@
+final: prev: {
+
+  rocksdb = prev.rocksdb.overrideAttrs (oldAttrs: rec {
+    version = "8.1.1";
+
+    src = final.fetchFromGitHub {
+      owner = "facebook";
+      repo = oldAttrs.pname;
+      rev = "v${version}";
+      hash = "sha256-79hRtc5QSWLLyjRGCmuYZSoIc9IcIsnl8UCinz2sVw4=";
+    };
+  });
+}

rust-toolchain.toml

@@ -1,2 +1,10 @@
 [toolchain]
 channel = "1.75.0"
+components = [
+  "cargo",
+  "clippy",
+  "rust-src",
+  "rust-std",
+  "rustc",
+  "rustfmt"
+]

tests/common.rs

@@ -57,7 +57,7 @@ impl TestRunner {
         }
 
         // Setup node
-        let node = NodeD::with_conf(noded::downloaded_exe_path().unwrap(), &node_conf).unwrap();
+        let node = NodeD::with_conf(noded::exe_path().unwrap(), &node_conf).unwrap();
 
         #[cfg(not(feature = "liquid"))]
         let (node_client, params) = (&node.client, &node.params);

tests/electrum.rs

@@ -23,8 +23,7 @@ fn test_electrum() -> Result<()> {
     let server_arg = format!("{}:t", electrum_addr.to_string());
     electrum_wallet_conf.args = vec!["-v", "--server", &server_arg];
     electrum_wallet_conf.view_stdout = true;
-    let electrum_wallet =
-        ElectrumD::with_conf(electrumd::downloaded_exe_path()?, &electrum_wallet_conf)?;
+    let electrum_wallet = ElectrumD::with_conf(electrumd::exe_path()?, &electrum_wallet_conf)?;
 
     let notify_wallet = || {
         electrum_server.notify();