nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2928 from akc/spelling

Browse Source 
Fix trivial spelling mistake in docs
This commit is contained in:
Domen Kožar 2014-06-13 13:49:05 +02:00
commit 5c01d45a62
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes.xml
View File

@ -446,7 +446,7 @@ xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix
<literal>stdenv</literal>; the formed changes the C compiler, and <literal>stdenv</literal>; the formed changes the C compiler, and
the latter adds additional packages to the front of the latter adds additional packages to the front of
<literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing
tools to be overriden.</para> tools to be overridden.</para>
<para>For instance, the package <varname>strategoxt</varname> <para>For instance, the package <varname>strategoxt</varname>
doesn’t build with the GNU Make in <literal>stdenv</literal> doesn’t build with the GNU Make in <literal>stdenv</literal>

4
doc/stdenv.xml
View File

@ -56,7 +56,7 @@ details.)</para>
<para>Often it is necessary to override or modify some aspect of the <para>Often it is necessary to override or modify some aspect of the
build. To make this easier, the standard environment breaks the build. To make this easier, the standard environment breaks the
package build into a number of <emphasis>phases</emphasis>, all of package build into a number of <emphasis>phases</emphasis>, all of
which can be overriden or modified individually: unpacking the which can be overridden or modified individually: unpacking the
sources, applying patches, configuring, building, and installing. sources, applying patches, configuring, building, and installing.
(There are some others; see <xref linkend="ssec-stdenv-phases"/>.) (There are some others; see <xref linkend="ssec-stdenv-phases"/>.)
For instance, a package that doesn’t supply a makefile but instead has For instance, a package that doesn’t supply a makefile but instead has
@ -233,7 +233,7 @@ specific parts of the build (e.g., unpacking the sources or installing
the binaries). Furthermore, it allows a nicer presentation of build the binaries). Furthermore, it allows a nicer presentation of build
logs in the Nix build farm.</para> logs in the Nix build farm.</para>
<para>Each phase can be overriden in its entirety either by setting <para>Each phase can be overridden in its entirety either by setting
the environment variable the environment variable
<varname><replaceable>name</replaceable>Phase</varname> to a string <varname><replaceable>name</replaceable>Phase</varname> to a string
containing some shell commands to be executed, or by redefining the containing some shell commands to be executed, or by redefining the

2
nixos/doc/manual/configuration.xml
View File

@ -873,7 +873,7 @@ Any package in Nixpkgs that depends on <literal>emacs</literal> will
be passed your customised instance. (However, the value be passed your customised instance. (However, the value
<literal>pkgs.emacs</literal> in <literal>pkgs.emacs</literal> in
<varname>nixpkgs.config.packageOverrides</varname> refers to the <varname>nixpkgs.config.packageOverrides</varname> refers to the
original rather than overriden instance, to prevent an infinite original rather than overridden instance, to prevent an infinite
recursion.)</para> recursion.)</para>
</section> </section>