diff options
| -rw-r--r-- | doc/manual/package-management.xml | 2 | ||||
| -rw-r--r-- | doc/manual/writing-nix-expressions.xml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index 927719e93912..a24ca0a696d6 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -92,7 +92,7 @@ component is installed in your current user environment. The second very quick operation). The last one (<literal>S</literal>) indicates whether there is a so-called <emphasis>substitute</emphasis> for the component, which is Nix’s mechanism for doing binary deployment. It -just means that Nix know that it can fetch a pre-built component from +just means that Nix knows that it can fetch a pre-built component from somewhere (typically a network server) instead of building it locally.</para> diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml index b8d097ae2286..1cc5bb95b8c3 100644 --- a/doc/manual/writing-nix-expressions.xml +++ b/doc/manual/writing-nix-expressions.xml @@ -635,13 +635,14 @@ language.</para> complicated example (from the Nix expression for <link xlink:href='http://www.trolltech.com/products/qt'>Qt</link>): -<programlisting> +<programlisting> configureFlags = " -system-zlib -system-libpng -system-libjpeg ${if openglSupport then "-dlopen-opengl -L${mesa}/lib -I${mesa}/include -L${libXmu}/lib -I${libXmu}/include" else ""} - ${if threadSupport then "-thread" else "-no-thread"}</programlisting> + ${if threadSupport then "-thread" else "-no-thread"} +";</programlisting> Note that Nix expressions and strings can be arbitrarily nested; in this case the outer string contains various antiquotations that |