diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-11T10·50+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-11T10·50+0200 |
commit | 22a47ab03c8a1bf81df3aa0d29a4d6a29aacc36f (patch) | |
tree | 3042369eab7c00fe5561e11507a0334fee0278c1 /nix-repl.cc | |
parent | 6a4a8208be10462b1051c689b26577dc36495632 (diff) |
Fix building against Nix 1.7
Diffstat (limited to 'nix-repl.cc')
-rw-r--r-- | nix-repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nix-repl.cc b/nix-repl.cc index 1c7b2f5142e9..ef9be417acdd 100644 --- a/nix-repl.cc +++ b/nix-repl.cc @@ -323,7 +323,7 @@ bool NixRepl::processLine(string line) but doing it in a child makes it easier to recover from problems / SIGINT. */ if (runProgram("nix-store", Strings{"-r", drvPath}) == 0) { - Derivation drv = parseDerivation(readFile(drvPath)); + Derivation drv = readDerivation(drvPath); std::cout << std::endl << "this derivation produced the following outputs:" << std::endl; foreach (DerivationOutputs::iterator, i, drv.outputs) std::cout << format(" %1% -> %2%") % i->first % i->second.path << std::endl; @@ -494,7 +494,7 @@ std::ostream & NixRepl::printValue(std::ostream & str, Value & v, unsigned int m str << "«derivation "; Bindings::iterator i = v.attrs->find(state.sDrvPath); PathSet context; - Path drvPath = i != v.attrs->end() ? state.coerceToPath(*i->value, context) : "???"; + Path drvPath = i != v.attrs->end() ? state.coerceToPath(*i->pos, *i->value, context) : "???"; str << drvPath << "»"; } |