public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50383 from bhipple/fix/docs

Browse Source 
docs: fix minor grammar issues in the manual
This commit is contained in:
Jörg Thalheim 2018-11-15 15:48:12 +00:00 committed by GitHub
commit 36b6192980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/stdenv.xml
View File

@ -2077,7 +2077,7 @@ someVar=$(stripHash $name)
Nix itself considers a build-time dependency merely something that should Nix itself considers a build-time dependency merely something that should
previously be built and accessible at build time—packages themselves are previously be built and accessible at build time—packages themselves are
on their own to perform any additional setup. In most cases, that is fine, on their own to perform any additional setup. In most cases, that is fine,
and the downstream derivation can deal with it's own dependencies. But for a and the downstream derivation can deal with its own dependencies. But for a
few common tasks, that would result in almost every package doing the same few common tasks, that would result in almost every package doing the same
sort of setup work---depending not on the package itself, but entirely on sort of setup work---depending not on the package itself, but entirely on
which dependencies were used. which dependencies were used.
@ -2131,10 +2131,10 @@ someVar=$(stripHash $name)
<literal>n + 1</literal> dependencies, as only those ones match the <literal>n + 1</literal> dependencies, as only those ones match the
compiler's target platform. The <envar>hostOffset</envar> variable is compiler's target platform. The <envar>hostOffset</envar> variable is
defined with the current dependency's host offset defined with the current dependency's host offset
<envar>targetOffset</envar> with its target offset, before it's setup hook <envar>targetOffset</envar> with its target offset, before its setup hook is
is sourced. Additionally, since most environment hooks don't care about the sourced. Additionally, since most environment hooks don't care about the
target platform, That means the setup hook can append to the right bash target platform, That means the setup hook can append to the right bash array
array by doing something like by doing something like
<programlisting language="bash"> <programlisting language="bash">
addEnvHooks "$hostOffset" myBashFunction addEnvHooks "$hostOffset" myBashFunction
</programlisting> </programlisting>
@ -2142,7 +2142,7 @@ addEnvHooks "$hostOffset" myBashFunction
<para> <para>
The <emphasis>existence</emphasis> of setups hooks has long been documented The <emphasis>existence</emphasis> of setups hooks has long been documented
and packages inside Nixpkgs are free to use these mechanism. Other packages, and packages inside Nixpkgs are free to use this mechanism. Other packages,
however, should not rely on these mechanisms not changing between Nixpkgs however, should not rely on these mechanisms not changing between Nixpkgs
versions. Because of the existing issues with this system, there's little versions. Because of the existing issues with this system, there's little
benefit from mandating it be stable for any period of time. benefit from mandating it be stable for any period of time.