diff options
| -rw-r--r-- | doc/stdenv.xml | 2 | ||||
| -rw-r--r-- | maintainers/docs/cross.txt | 6 | ||||
| -rw-r--r-- | pkgs/build-support/fetchmtn/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxml2/setup-hook.sh | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 7bcbadd8ea9ab..f0cabe425a3d6 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -6,7 +6,7 @@ <para>The standard build environment in the Nix Packages collection -provides a environment for building Unix packages that does a lot of +provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard <literal>./configure; make; make install</literal> build interface, you don’t need to write a build script at all; the standard diff --git a/maintainers/docs/cross.txt b/maintainers/docs/cross.txt index 32e09086b87e8..9c117774fc4b0 100644 --- a/maintainers/docs/cross.txt +++ b/maintainers/docs/cross.txt @@ -41,7 +41,7 @@ NB: Keep in mind that many programs are not very well suited for cross compilation. Either they are not intended to run on other platforms, -because the code is highly platform specific, or the configuration proces +because the code is highly platform specific, or the configuration process is not written with cross compilation in mind. Nix will not solve these problems for you! @@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux are "patch", "make" and "wget". If we want to build C++ programs it gets a lot more difficult. GCC has a -three step compilation proces. In the first step a simple compiler, called +three step compilation process. In the first step a simple compiler, called xgcc, that can compile only C programs is built. With that compiler it compiles itself two more times: one time to build a full compiler, and another time to build a full compiler once again with the freshly built compiler from @@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix. --- -After succesfully completing the whole toolchain you can start building +After successfully completing the whole toolchain you can start building packages with the newly built tools. To make everything build correctly you will need a stdenv for your target platform. Setting up this platform will take some effort. Right now there is a very experimental setup for diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 4e34aad052b59..c1b0db895bc10 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -24,7 +24,7 @@ for source in $dbs; do echo "selector $selector does not match any revision"; fi else - echo "pulling branch $branch wasn't succesfull"; + echo "pulling branch $branch wasn't successful"; fi; if test -n "$done"; then break; diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh index f8e4f5e0fd64f..112dbe0c5136d 100644 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ b/pkgs/development/libraries/libxml2/setup-hook.sh @@ -11,7 +11,7 @@ addXMLCatalogs () { if test -z "$libxmlHookDone"; then libxmlHookDone=1 - # Set http_proxy and ftp_proxy to a invalid host to prevent + # Set http_proxy and ftp_proxy to an invalid host to prevent # xmllint and xsltproc from trying to download DTDs from the # network even when --nonet is not given. That would be impure. # (Note that .invalid is a reserved domain guaranteed not to |