Unverified Commit 14d44173 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #256949 from andresilva/build-rust-package-profiles 

buildRustPackage: support custom cargo profiles
parents 50751b06 86749222

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

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
assert cargoVendorDir == null && cargoLock == null

    -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null)

    -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set";

assert buildType == "release" || buildType == "debug";



let

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cargoBuildHook() { 
    fi



    if [ "${cargoBuildType}" != "debug" ]; then

        cargoBuildProfileFlag="--${cargoBuildType}"

        cargoBuildProfileFlag="--profile ${cargoBuildType}"

    fi



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

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cargoCheckHook() { 
    fi



    if [ "${cargoCheckType}" != "debug" ]; then

        cargoCheckProfileFlag="--${cargoCheckType}"

        cargoCheckProfileFlag="--profile ${cargoCheckType}"

    fi



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

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cargoNextestHook() { 
    fi



    if [ "${cargoCheckType}" != "debug" ]; then

        cargoCheckProfileFlag="--${cargoCheckType}"

        cargoCheckProfileFlag="--cargo-profile ${cargoCheckType}"

    fi



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