rust: re add setEnv to cargo build hooks

This commit is contained in:
Daniel Barter
2025-03-11 12:17:51 +01:00
committed by Alyssa Ross
parent 18c4006b6d
commit 009de0667f
4 changed files with 8 additions and 3 deletions
@@ -38,7 +38,7 @@ cargoBuildHook() {
concatTo flagsArray cargoBuildFlags
echoCmd 'cargoBuildHook flags' "${flagsArray[@]}"
cargo build "${flagsArray[@]}"
@setEnv@ cargo build "${flagsArray[@]}"
if [ -n "${buildAndTestSubdir-}" ]; then
popd
@@ -37,7 +37,7 @@ cargoCheckHook() {
concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray
echoCmd 'cargoCheckHook flags' "${flagsArray[@]}"
cargo test "${flagsArray[@]}"
@setEnv@ cargo test "${flagsArray[@]}"
if [[ -n "${buildAndTestSubdir-}" ]]; then
popd
@@ -27,6 +27,8 @@
name = "cargo-build-hook.sh";
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
};
passthru.tests =
{
@@ -44,6 +46,7 @@
name = "cargo-check-hook.sh";
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
};
passthru.tests =
{
@@ -136,6 +139,8 @@
];
substitutions = {
inherit (stdenv.targetPlatform.rust) rustcTarget;
inherit (rust.envVars) setEnv;
};
} ./maturin-build-hook.sh
) { };
@@ -31,7 +31,7 @@ maturinBuildHook() {
concatTo flagsArray maturinBuildFlags
echoCmd 'maturinBuildHook flags' "${flagsArray[@]}"
maturin build "${flagsArray[@]}"
@setEnv@ maturin build "${flagsArray[@]}"
if [ -n "${buildAndTestSubdir-}" ]; then
popd