diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
| commit | 90c78aee6c04e0f3444a6b73344871a6e8ff9ea5 (patch) | |
| tree | 0dd9562d2783db3223b20e66c55eba0b19ffabdd /doc/stdenv | |
| parent | a1cd06f900febb73d1c4edb17685eec8499d6097 (diff) | |
| parent | 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 (diff) | |
Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs
Diffstat (limited to 'doc/stdenv')
| -rw-r--r-- | doc/stdenv/cross-compilation.chapter.md | 2 | ||||
| -rw-r--r-- | doc/stdenv/stdenv.chapter.md | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 5f7ff513959ab..e659e1803807a 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -150,7 +150,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ]; Add the following to your `mkDerivation` invocation. ```nix -doCheck = stdenv.hostPlatform == stdenv.buildPlatform; +doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; ``` #### Package using Meson needs to run binaries for the host platform during build. {#cross-meson-runs-host-code} diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index b34c39e3b8e02..2562d149cb1e4 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -654,7 +654,11 @@ A list of strings passed as additional flags to `make`. Like `makeFlags` and `ma ##### `checkInputs` {#var-stdenv-checkInputs} -A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doCheck` is set. +A list of host dependencies used by the phase, usually libraries linked into executables built during tests. This gets included in `buildInputs` when `doCheck` is set. + +##### `nativeCheckInputs` {#var-stdenv-nativeCheckInputs} + +A list of native dependencies used by the phase, notably tools needed on `$PATH`. This gets included in `nativeBuildInputs` when `doCheck` is set. ##### `preCheck` {#var-stdenv-preCheck} @@ -821,7 +825,11 @@ A list of strings passed as additional flags to `make`. Like `makeFlags` and `ma ##### `installCheckInputs` {#var-stdenv-installCheckInputs} -A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. +A list of host dependencies used by the phase, usually libraries linked into executables built during tests. This gets included in `buildInputs` when `doInstallCheck` is set. + +##### `nativeInstallCheckInputs` {#var-stdenv-nativeInstallCheckInputs} + +A list of native dependencies used by the phase, notably tools needed on `$PATH`. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. ##### `preInstallCheck` {#var-stdenv-preInstallCheck} |