Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/cross-wasi/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
mkShellNoCC {
nativeBuildInputs = [ rust-bin.stable.latest.minimal ];

depsBuildBuild = [ wasmtime ];
depsBuildBuild = [ wasmtime.out ];

# This is optional for wasm32-like targets, since rustc will automatically use
# the bundled `lld` for linking.
Expand Down
3 changes: 2 additions & 1 deletion lib/mk-component-set.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ let
}
if [[ -e "$out/etc" ]]; then
handleEtc "$out/etc/bash_completion.d" "$out/share/bash-completion/completions"
rmdir $out/etc || { echo "Installer tries to install to /etc: $(ls $out/etc)"; exit 1; }
# Remove if empty. Skip if produced `/etc/target-spec-json-schema.json`.
rmdir --ignore-fail-on-non-empty $out/etc
fi
'';

Expand Down