646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
25 lines
632 B
Diff
25 lines
632 B
Diff
Avoid build-only store references embedding into 'mutt -v'.
|
|
--- a/txt2c.sh
|
|
+++ b/txt2c.sh
|
|
@@ -21,8 +21,18 @@ txt2c_fallback () {
|
|
echo ";"
|
|
}
|
|
|
|
+nix_store_mangle() {
|
|
+ # consume stdin
|
|
+
|
|
+ # Avoid build-only references to nix store. These are usually
|
|
+ # 'gcc -v' output embedded into 'mutt -v'. But also might be
|
|
+ # ./configure-passed arguments.
|
|
+ sed \
|
|
+ -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g"
|
|
+}
|
|
+
|
|
if ./txt2c test </dev/null >/dev/null 2>&1; then
|
|
- ./txt2c "$1"
|
|
+ nix_store_mangle | ./txt2c "$1"
|
|
else
|
|
- txt2c_fallback "$1"
|
|
+ nix_store_mangle | txt2c_fallback "$1"
|
|
fi
|