diff --git a/examples/cross-wasi/shell.nix b/examples/cross-wasi/shell.nix
index 180503df..c61e1902 100644
--- a/examples/cross-wasi/shell.nix
+++ b/examples/cross-wasi/shell.nix
@@ -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.
diff --git a/lib/mk-component-set.nix b/lib/mk-component-set.nix
index 779de12b..6d7be4a0 100644
--- a/lib/mk-component-set.nix
+++ b/lib/mk-component-set.nix
@@ -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
       '';