Skip to content

Commit 30efc37

Browse files
authored
fix: forces correct path for including openssl dependencies (#158)
2 parents 4d61364 + 2295d45 commit 30efc37

File tree

5 files changed

+9
-111
lines changed

5 files changed

+9
-111
lines changed

Cargo.lock

Lines changed: 0 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/automation/devshells.nix

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@
1010

1111
catalystCore = {...}: {
1212
name = nixpkgs.lib.mkForce "Catalyst Core";
13-
env = mkEnv {
14-
PROTOC = "${nixpkgs.protobuf}/bin/protoc";
15-
PROTOC_INCLUDE = "${nixpkgs.protobuf}/include";
16-
};
13+
env = with nixpkgs;
14+
mkEnv {
15+
OPENSSL_NO_VENDOR = 1;
16+
OPENSSL_DIR = "${l.getDev openssl}";
17+
OPENSSL_LIB_DIR = "${l.getLib openssl}/lib";
18+
PROTOC = "${protobuf}/bin/protoc";
19+
PROTOC_INCLUDE = "${protobuf}/include";
20+
};
1721
nixago = [
1822
cell.configs.lefthook
1923
cell.configs.prettier
2024
cell.configs.treefmt
2125
];
2226
packages = with nixpkgs; [
27+
gcc
2328
rustToolchain
2429
pkg-config
25-
openssl
2630
protobuf
2731
uniffi-bindgen
2832
postgresql

src/chain-libs/imhamt/Cargo.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ proptest = { workspace = true }
1616
test-strategy = "0.2"
1717
trybuild = "1"
1818

19-
[target.'cfg(unix)'.dev-dependencies]
20-
jemalloc-ctl = "0.3"
21-
jemallocator = "*"
22-
23-
[[example]]
24-
name = "memdump"
25-
path = "examples/memdump/main.rs"
2619

2720
[[bench]]
2821
harness = false

src/chain-libs/imhamt/examples/memdump/main.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/chain-libs/imhamt/examples/memdump/unix.rs

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)