diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-11-15 15:41:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 15:41:45 +0100 |
| commit | aa7981ebc4e409069baf5aec018419d7a6dfa0e4 (patch) | |
| tree | 5442cbba880b8df2938d62fadc34c9fd641b49e1 /pkgs/applications/blockchains | |
| parent | 20d6600e8ad1f1bd0e373346f88b4fed11325030 (diff) | |
| parent | af9b2fc0ae447acc539fa6d9261023384c327bfc (diff) | |
Merge pull request #145823 from prusnak/rocksdb_6_23
rocksdb: reintroduce rocksdb 6.23.3 as rocksdb_6_23
Diffstat (limited to 'pkgs/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/electrs/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 84b2a2f736a16..13d0994799ab4 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -3,10 +3,13 @@ , rustPlatform , fetchFromGitHub , llvmPackages -, rocksdb +, rocksdb_6_23 , Security }: +let + rocksdb = rocksdb_6_23; +in rustPlatform.buildRustPackage rec { pname = "electrs"; version = "0.9.2"; @@ -24,12 +27,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 - # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 - # # link rocksdb dynamically - # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; |