From 99cb7f40bbea6e017fbafff478fdb45f8d21c801 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 20 Sep 2021 19:12:30 +0200 Subject: [PATCH 1/2] electrs: 0.8.11 -> 0.8.12 --- pkgs/applications/blockchains/electrs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 527d368bf825..f688dc1bc25c 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -6,21 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "024sdyvrx7s4inldamq4c8lv0iijjyd18j1mm9x6xf2clmvicaa6"; + sha256 = "0kd5zki9f1pnwscnvd921dw0lc45nfkwk23l33nzdjn005lmsw7v"; }; + cargoSha256 = "1l8dwjwj21crxampzj5c0k98xnisgy3d9c3dkgf5vaybrcp04k85"; + # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "0yl50ryxidbs9wkabz919mgbmsgsqjp1bjw792l1lkgncq8z9r5b"; - meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; homepage = "https://github.com/romanz/electrs"; From 9baf54d902b13309f2b8fd135e12f1f19ecf9561 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 20 Sep 2021 19:13:53 +0200 Subject: [PATCH 2/2] electrs: link rocksdb dynamically --- pkgs/applications/blockchains/electrs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index f688dc1bc25c..ec135b7e931d 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , llvmPackages +, rocksdb }: rustPlatform.buildRustPackage rec { @@ -21,6 +22,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # link rocksdb dynamically + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + cargoBuildFlags = "--no-default-features"; + meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; homepage = "https://github.com/romanz/electrs";