mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Communicate the structured log FD to builders

Browse source 
Since we may use a dedicated file descriptor in the future, this
allows us to change it. So builders can do

  if [[ -n $NIX_LOG_FD ]]; then
    echo "@nix { message... }" >&$NIX_LOG_FD
  fi
This commit is contained in:
Eelco Dolstra 2017-09-08 11:27:10 +02:00
parent 24e23a1a73
commit 88e6bb76de
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -2202,7 +2202,7 @@ void DerivationGoal::initEnv()
env["NIX_BUILD_CORES"] = (format("%d") % settings.buildCores).str(); env["NIX_BUILD_CORES"] = (format("%d") % settings.buildCores).str();
/* In non-structured mode, add all bindings specified in the /* In non-structured mode, add all bindings specified in the
derivation via the environments, except those listed in the derivation via the environment, except those listed in the
passAsFile attribute. Those are passed as file names pointing passAsFile attribute. Those are passed as file names pointing
to temporary files containing the contents. Note that to temporary files containing the contents. Note that
passAsFile is ignored in structure mode because it's not passAsFile is ignored in structure mode because it's not
@ -2258,6 +2258,11 @@ void DerivationGoal::initEnv()
Strings varNames = tokenizeString<Strings>(get(drv->env, "impureEnvVars")); Strings varNames = tokenizeString<Strings>(get(drv->env, "impureEnvVars"));
for (auto & i : varNames) env[i] = getEnv(i); for (auto & i : varNames) env[i] = getEnv(i);
} }
/* Currently structured log messages piggyback on stderr, but we
may change that in the future. So tell the builder which file
descriptor to use for that. */
env["NIX_LOG_FD"] = "2";
} }