wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 05:11:47 +02:00
Code Activity

nix-instantiate: Fix read-only evaluation

Browse source
This commit is contained in:
Eelco Dolstra 2012-11-26 17:39:09 +01:00
parent 8d8d47abd2
commit 408a7bfac1
5 changed files with 17 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

@ -62,16 +62,9 @@ void processExpr(EvalState & state, const Strings & attrPaths,
Path drvPath = i->queryDrvPath(state);
/* What output do we want? */
Path outPath = i->queryOutPath(state);
Derivation drv = derivationFromPath(*store, drvPath);
string outputName;
foreach (DerivationOutputs::iterator, i, drv.outputs)
if (i->second.path == outPath) {
outputName = i->first;
break;
}
string outputName = i->queryOutputName(state);
if (outputName == "")
throw Error(format("derivation `%1%' does not have an output `%2%'") % drvPath % outPath);
throw Error(format("derivation `%1%' lacks an `outputName' attribute ") % drvPath);
if (gcRoot == "")
printGCWarning();