cb5946cd93
Envoy 1.32 has added some more dependencies on rules_rust bits, so we need to support that now. In particular, for some reason, we always fail with a message about needing repinning, so we repin during the IFD phase, but we need to point rules_rust at the nixpkgs Rust toolchain, make it build the cargo-bazel tool (because the one in nixpkgs is the wrong version), and then clean up afterwards.
19 lines
473 B
Diff
19 lines
473 B
Diff
--- crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh
|
|
+++ crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env bash
|
|
+#!@bash@
|
|
#
|
|
# For details, see:
|
|
# `@rules_rust//crate_universe/src/metadata/cargo_tree_resolver.rs - TreeResolver::create_rustc_wrapper`
|
|
|
|
--- util/process_wrapper/private/process_wrapper.sh
|
|
+++ util/process_wrapper/private/process_wrapper.sh
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env bash
|
|
+#!@bash@
|
|
|
|
set -euo pipefail
|
|
|
|
|