From 99b0ea7c67e9e545bdf8b8bb050ce63dc9440e95 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Oct 2006 23:06:47 +0000 Subject: [PATCH] * Typo reported by Arie Middelkoop. * Left out close-quote in example. --- doc/manual/package-management.xml | 2 +- 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 927719e939..a24ca0a696 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 (S) indicates whether there is a so-called substitute 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. diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml index b8d097ae22..1cc5bb95b8 100644 --- a/doc/manual/writing-nix-expressions.xml +++ b/doc/manual/writing-nix-expressions.xml @@ -635,13 +635,14 @@ language. complicated example (from the Nix expression for Qt): - + 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"} + ${if threadSupport then "-thread" else "-no-thread"} +"; Note that Nix expressions and strings can be arbitrarily nested; in this case the outer string contains various antiquotations that