From 62d9b31d0a86fc0fc5b198e4d46722573432918c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Nov 2003 14:25:39 +0000 Subject: [PATCH] * Updates. --- doc/manual/Makefile.am | 3 ++- doc/manual/book.xml | 2 ++ doc/manual/installation.xml | 23 +++++++++++++++++++++++ doc/manual/overview.xml | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 doc/manual/overview.xml diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 8e2fff208..51ed7c05f 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -4,7 +4,8 @@ XMLLINT = $(ENV) $(xmllint) $(xmlflags) --catalogs XSLTPROC = $(ENV) $(xsltproc) $(xmlflags) --catalogs SOURCES = book.xml introduction.xml installation.xml \ - nix-store-reference.xml \ + overview.xml \ + nix-store-reference.xml nix-instantiate-reference.xml \ troubleshooting.xml bugs.xml book.is-valid: $(SOURCES) diff --git a/doc/manual/book.xml b/doc/manual/book.xml index 710246ca1..7248e5e18 100644 --- a/doc/manual/book.xml +++ b/doc/manual/book.xml @@ -5,6 +5,7 @@ [ + @@ -27,6 +28,7 @@ &introduction; &installation; + &overview; Command Reference diff --git a/doc/manual/installation.xml b/doc/manual/installation.xml index 3872a7fb8..7d11fa43e 100644 --- a/doc/manual/installation.xml +++ b/doc/manual/installation.xml @@ -111,6 +111,29 @@ $ autoreconf -i + + + Using Nix + + + To use Nix, some environment variables should be set. In particular, + PATH should contain the directories + prefix/bin and + prefix/var/nix/links/current/bin. + The first directory contains the Nix tools themselves, while the second + contains to the current user environment (an + automatically generated package consisting of symlinks to installed + packages). The simplest way to set the required environment variables is + to include the file + prefix/etc/profile.d/nix.sh + in your ~/.bashrc (or similar), like this: + + + +. prefix/etc/profile.d/nix.sh + + +