diff options
| -rw-r--r-- | doc/manual/conf-file.xml | 6 | ||||
| -rw-r--r-- | scripts/download-from-binary-cache.pl.in | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index cccee8d46202..c73466ef5cf6 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -30,6 +30,9 @@ gc-keep-derivations = true # Idem env-keep-derivations = false </programlisting> +<para>You can override settings using the <option>--option</option> +flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para> + <para>The following settings are currently available: <variablelist> @@ -310,8 +313,7 @@ build-use-chroot = /dev /proc /bin</programlisting> <varlistentry><term><literal>binary-caches</literal></term> <listitem><para>A list of URLs of binary caches, separated by - whitespace. It can be overriden through the environment variable - <envar>NIX_BINARY_CACHES</envar>. The default is + whitespace. The default is <literal>http://nixos.org/binary-cache</literal>.</para></listitem> </varlistentry> diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index 6482b9c18391..7e203ec9d057 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -166,9 +166,8 @@ sub getAvailableCaches { $gotCaches = 1; my @urls = map { s/\/+$//; $_ } split(/ /, - ($ENV{"NIX_BINARY_CACHES"} - // $Nix::Config::config{"binary-caches"} - // ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : ""))); + $Nix::Config::config{"binary-caches"} + // ($Nix::Config::storeDir eq "/nix/store" ? "http://nixos.org/binary-cache" : "")); foreach my $url (@urls) { |