diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
| commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
| tree | 4a99561053ba51db60a75389e483784543b105ff /doc | |
| parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
| parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
| download | nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixpkgs-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip | |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/stdenv.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 2a3316b8d01..31d3d0ca3c4 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1006,6 +1006,13 @@ but only if the <varname>doCheck</varname> variable is enabled.</para> </varlistentry> <varlistentry> + <term><varname>checkInputs</varname></term> + <listitem><para> + A list of dependencies used by the phase. This gets included in <varname>buildInputs</varname> when <varname>doCheck</varname> is set. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>makeFlags</varname> / <varname>makeFlagsArray</varname> / <varname>makefile</varname></term> @@ -1292,6 +1299,13 @@ installcheck</command>.</para> </varlistentry> <varlistentry> + <term><varname>installCheckInputs</varname></term> + <listitem><para> + A list of dependencies used by the phase. This gets included in <varname>buildInputs</varname> when <varname>doInstallCheck</varname> is set. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>preInstallCheck</varname></term> <listitem><para>Hook executed at the start of the installCheck phase.</para></listitem> |