Skip to content

Commit

Permalink
Fixes building/testing on Nix (#1323)
Browse files Browse the repository at this point in the history
* add lsof for smoketest initialization

* add cc to ld lib path for solc dyn. linking

* add rust-src to stable toolchain

* bump polkadot/api-cli version
  • Loading branch information
Lederstrumpf authored Oct 29, 2024
1 parent ac2f6a9 commit 96cb1ae
Show file tree
Hide file tree
Showing 4 changed files with 434 additions and 141 deletions.
2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
curl
direnv
git
lsof
jq
moreutils
typos
Expand Down Expand Up @@ -92,6 +93,7 @@
# LIBCLANG_PATH points rocksdb to a clang.so on Linux
export LIBCLANG_PATH="$(readlink -f ${pkgs.clang}/resource-root/include | xargs dirname | xargs dirname | xargs dirname)"
export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]}
cowsay "Development Environment Ready"
'';
Expand Down
1 change: 1 addition & 0 deletions scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ rustup default stable
rustup target add wasm32-unknown-unknown
rustup install --profile minimal $RUST_NIGHTLY_VERSION
rustup component add --toolchain $RUST_NIGHTLY_VERSION rustfmt
rustup component add --toolchain stable rust-src
rustup show

echo "Installing sszgen"
Expand Down
2 changes: 1 addition & 1 deletion web/packages/test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"@polkadot/api": "^12.4.2",
"@polkadot/types": "^12.4.2",
"@polkadot/api-cli": "^0.57.4",
"@polkadot/api-cli": "^0.60.1",
"@polkadot/keyring": "^13.0.2",
"@polkadot/util": "^13.0.2",
"@polkadot/util-crypto": "^13.0.2",
Expand Down
Loading

0 comments on commit 96cb1ae

Please sign in to comment.