Try including OpenSSL inside nix develop shell

informalsystems · Mar 4, 2025 · e06ca51 · e06ca51
1 parent a48eb3e
commit e06ca51
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 19 deletions.
diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -36,9 +36,10 @@ jobs:
           RUST_BACKTRACE: 1
           TEST_PRESET: ${{ matrix.preset }}
         run: |
-            nix shell .#rust .#cargo-nextest .#protobuf .#gaia .#celestia-app .#ibc-go-v8-simapp .#osmosis -c \
-              cargo nextest run -p hermes-cosmos-integration-tests \
-              --test-threads=2
+            nix develop -c \
+              nix shell .#gaia .#celestia-app .#ibc-go-v8-simapp .#osmosis -c \
+                cargo nextest run -p hermes-cosmos-integration-tests \
+                --test-threads=2
 
   wasm-cosmos-integration-tests:
     runs-on: ubuntu-22.04
@@ -60,9 +61,10 @@ jobs:
         run: |
             export WASM_FILE_PATH=$(nix build .#tendermint-wasm-client --print-out-paths --no-link)/ibc_client_tendermint_cw.wasm
 
-            nix shell .#rust .#cargo-nextest .#protobuf .#gaia .#ibc-go-v8-wasm-simapp -c \
-              cargo nextest run -p hermes-cosmos-wasm-relayer \
-              --test-threads=2
+            nix develop -c \
+              nix shell .#gaia .#ibc-go-v8-wasm-simapp -c \
+                cargo nextest run -p hermes-cosmos-wasm-relayer \
+                --test-threads=2
 
   celestia-integration-tests:
     runs-on: ubuntu-22.04
@@ -82,7 +84,8 @@ jobs:
         env:
           RUST_BACKTRACE: 1
         run: |
-            nix shell .#rust .#cargo-nextest .#protobuf .#gaia .#celestia-app .#celestia-node -c \
-              cargo nextest run -p hermes-celestia-integration-tests \
-              --test-threads=2 \
-              --failure-output final
+            nix develop -c \
+              nix shell .#gaia .#celestia-app .#celestia-node -c \
+                cargo nextest run -p hermes-celestia-integration-tests \
+                --test-threads=2 \
+                --failure-output final
diff --git a/flake.nix b/flake.nix
@@ -62,21 +62,21 @@
         inherit nixpkgs;
         inherit (inputs) celestia-node-src;
       };
+
+      inherit
+        (nixpkgs)
+        protobuf
+        openssl
+        cargo-nextest
+      ;
+
     in {
       packages = {
         inherit tendermint-wasm-client celestia-app celestia-node;
 
         gaia = cosmos-nix.gaia18;
 
-        rust = rust;
-
-        rust-nightly = rust-nightly;
-
-        inherit
-          (nixpkgs)
-          protobuf
-          cargo-nextest
-        ;
+        inherit rust rust-nightly;
 
         inherit
           (cosmos-nix)
@@ -89,5 +89,18 @@
           osmosis
         ;
       };
+
+
+        devShells = {
+          default = nixpkgs.mkShell {
+            PKG_CONFIG_PATH = "${nixpkgs.openssl.dev}/lib/pkgconfig";
+            buildInputs = [
+              rust
+              cargo-nextest
+              protobuf
+              openssl
+            ];
+          };
+        };
     });
 }