lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* For fixed-output derivations, pass the environment variables listed

Browse source 
in the attribute variable `impureEnvVars' from the caller to the
  builder.
This commit is contained in:
Eelco Dolstra 2006-05-31 09:51:45 +00:00
parent 04cf72287b
commit 50fe85f016
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/release-notes.xml
View file

@ -61,6 +61,8 @@ irreversible.</para></warning>
<listitem><para>TODO: function argument default values can refer to <listitem><para>TODO: function argument default values can refer to
other function arguments</para></listitem> other function arguments</para></listitem>
<listitem><para>TODO: proxy support.</para></listitem>
</itemizedlist> </itemizedlist>
</section> </section>

21
src/libstore/build.cc
View file

@ -1203,10 +1203,27 @@ void DerivationGoal::startBuilder()
derivation, tell the builder, so that for instance `fetchurl' derivation, tell the builder, so that for instance `fetchurl'
can skip checking the output. On older Nixes, this environment can skip checking the output. On older Nixes, this environment
variable won't be set, so `fetchurl' will do the check. */ variable won't be set, so `fetchurl' will do the check. */
bool fixedOutput = true;
for (DerivationOutputs::iterator i = drv.outputs.begin(); for (DerivationOutputs::iterator i = drv.outputs.begin();
i != drv.outputs.end(); ++i) i != drv.outputs.end(); ++i)
if (i->second.hash != "") if (i->second.hash == "") fixedOutput = false;
env["NIX_OUTPUT_CHECKED"] = "1"; if (fixedOutput)
env["NIX_OUTPUT_CHECKED"] = "1";
/* *Only* if this is a fixed-output derivation, propagate the
values of the environment variables specified in the
`impureEnvVars' attribute to the builder. This allows for
instance environment variables for proxy configuration such as
`http_proxy' to be easily passed to downloaders like
`fetchurl'. Passing such environment variables from the caller
to the builder is generally impure, but the output of
fixed-output derivations is by definition pure (since we
already know the cryptographic hash of the output). */
if (fixedOutput) {
Strings varNames = tokenizeString(drv.env["impureEnvVars"]);
for (Strings::iterator i = varNames.begin(); i != varNames.end(); ++i)
env[*i] = getEnv(*i);
}
/* If we are running as root, and the `build-allow-root' setting /* If we are running as root, and the `build-allow-root' setting