maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* expr-to-xml -> value-to-xml.

Browse source
This commit is contained in:
Eelco Dolstra 2010-04-07 13:59:45 +00:00
parent fc92244ba8
commit 9a64454faa
5 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/nix-instantiate/nix-instantiate.cc
View file

@ -7,7 +7,7 @@
#include "parser.hh"
#include "get-drvs.hh"
#include "attr-path.hh"
#include "expr-to-xml.hh"
#include "value-to-xml.hh"
#include "util.hh"
#include "store-api.hh"
#include "common-opts.hh"
@ -75,10 +75,15 @@ void processExpr(EvalState & state, const Strings & attrPaths,
std::cout << format("%1%\n") % canonicaliseExpr(e);
else {
Value v;
PathSet context;
state.eval(e, v);
if (strict) state.strictForceValue(v);
if (evalOnly)
std::cout << v << std::endl;
if (xmlOutput)
printValueAsXML(state, strict, v, std::cout, context);
else {
if (strict) state.strictForceValue(v);
std::cout << v << std::endl;
}
else {
DrvInfos drvs;
getDerivations(state, v, "", autoArgs, drvs);