diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/stdenv/cross-compilation.xml | 2 | ||||
| -rw-r--r-- | doc/stdenv/stdenv.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/stdenv/cross-compilation.xml b/doc/stdenv/cross-compilation.xml index 5476c9a4893..bea56a0c2fc 100644 --- a/doc/stdenv/cross-compilation.xml +++ b/doc/stdenv/cross-compilation.xml @@ -244,7 +244,7 @@ </question> <answer> <para> - Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`. + Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed <command>ar</command>. </para> </answer> </qandaentry> diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 0b59f90eb49..49699d7168d 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -1717,7 +1717,7 @@ someVar=$(stripHash $name) </para> <para> - The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`, <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`, <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). + The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of <envar>envBuildBuildHooks</envar>, <envar>envBuildHostHooks</envar>, <envar>envBuildTargetHooks</envar>, <envar>envHostHostHooks</envar>, <envar>envHostTargetHooks</envar>, or <envar>envTargetTargetHooks</envar>. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). </para> <para> |