mk-component-set: fix nightly build failure on non-empty /etc.

oxalica · oxalica · commit 66792ee2c2ac · 2025-09-15T05:58:16.000-04:00
See: <rust-lang/rust#144498>
diff --git 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
       '';
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,8 @@ let`
`122`	`122`	`}`
`123`	`123`	`if [[ -e "$out/etc" ]]; then`
`124`	`124`	`handleEtc "$out/etc/bash_completion.d" "$out/share/bash-completion/completions"`
`125`		`- rmdir $out/etc \|\| { echo "Installer tries to install to /etc: $(ls $out/etc)"; exit 1; }`
	`125`	+ # Remove if empty. Skip if produced `/etc/target-spec-json-schema.json`.
	`126`	`+ rmdir --ignore-fail-on-non-empty $out/etc`
`126`	`127`	`fi`
`127`	`128`	`'';`
`128`	`129`