Commit 009de066 authored by Daniel Barter's avatar Daniel Barter Committed by Alyssa Ross
Browse files

rust: re add setEnv to cargo build hooks

parent 18c4006b

pkgs/build-support/rust/hooks/cargo-build-hook.sh

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ cargoBuildHook() { 
    concatTo flagsArray cargoBuildFlags



    echoCmd 'cargoBuildHook flags' "${flagsArray[@]}"

    cargo build "${flagsArray[@]}"

    @setEnv@ cargo build "${flagsArray[@]}"



    if [ -n "${buildAndTestSubdir-}" ]; then

        popd

pkgs/build-support/rust/hooks/cargo-check-hook.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/build-support/rust/hooks/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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

  ) { };

pkgs/build-support/rust/hooks/maturin-build-hook.sh

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ maturinBuildHook() { 
    concatTo flagsArray maturinBuildFlags



    echoCmd 'maturinBuildHook flags' "${flagsArray[@]}"

    maturin build "${flagsArray[@]}"

    @setEnv@ maturin build "${flagsArray[@]}"



    if [ -n "${buildAndTestSubdir-}" ]; then

        popd