diff options
| author | Daniël de Kok <me@danieldk.eu> | 2021-02-26 11:51:31 +0100 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2021-02-26 11:57:27 +0100 |
| commit | c50a347cb5604fe92173204872d2ebdb694075b1 (patch) | |
| tree | f0f51ad2433bd4fca03f97855789995774669716 /pkgs/build-support | |
| parent | 10f68493764e51957db10d6c997e93d2746b5931 (diff) | |
buildRustPackage: use checkType argument
The `checkType` argument of buildRustPackage was not used anymore
since the refactoring of `buildRustPackage` into hooks. This was
an oversight that is fixed by this change.
The check type can also be passed directly to cargoCheckHook using the
`cargoCheckType` environment variable.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/rust/hooks/cargo-check-hook.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index bfa6c0d17cd6..ff9ca642daad 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u cargoBuildType = buildType; + cargoCheckType = checkType; + patchRegistryDeps = ./patch-registry-deps; nativeBuildInputs = nativeBuildInputs ++ [ diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 8c5b1a13219a..82e669af3a08 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -15,7 +15,7 @@ cargoCheckHook() { threads=1 fi - argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen"; + argstr="--${cargoCheckType} --target @rustTargetPlatformSpec@ --frozen"; ( set -x |