aboutsummaryrefslogtreecommitdiff
path: root/src/nix-instantiate/nix-instantiate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix-instantiate/nix-instantiate.cc')
-rw-r--r--src/nix-instantiate/nix-instantiate.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
index 270b4ddc2..beb7fa024 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -64,9 +64,11 @@ void processExpr(EvalState & state, const Strings & attrPaths,
Path drvPath = i->queryDrvPath(state);
if (gcRoot == "")
printGCWarning();
- else
- drvPath = addPermRoot(*store, drvPath,
- makeRootName(gcRoot, rootNr), indirectRoot);
+ else {
+ Path rootName = gcRoot;
+ if (++rootNr > 1) rootName += "-" + int2String(rootNr);
+ drvPath = addPermRoot(*store, drvPath, rootName, indirectRoot);
+ }
std::cout << format("%1%\n") % drvPath;
}
}