lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Include the output name in the GC root link

Browse source 
Output names are now appended to resulting GC symlinks, e.g. by
nix-build.  For backwards compatibility, if the output is named "out",
nothing is appended.  E.g. doing "nix-build -A foo" on a derivation
that produces outputs "out", "bin" and "dev" will produce symlinks
"./result", "./result-bin" and "./result-dev", respectively.
This commit is contained in:
Eelco Dolstra 2012-08-24 16:58:11 -04:00
parent 4aa1e5c554
commit a9e6752bbd
5 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libmain/shared.cc
View file

@ -33,16 +33,6 @@ static void sigintHandler(int signo)
} }
Path makeRootName(const Path & gcRoot, int & counter)
{
counter++;
if (counter == 1)
return gcRoot;
else
return (format("%1%-%2%") % gcRoot % counter).str();
}
void printGCWarning() void printGCWarning()
{ {
static bool haveWarned = false; static bool haveWarned = false;

1
src/libmain/shared.hh
View file

@ -26,7 +26,6 @@ MakeError(UsageError, nix::Error);
class StoreAPI; class StoreAPI;
/* Ugh. No better place to put this. */ /* Ugh. No better place to put this. */
Path makeRootName(const Path & gcRoot, int & counter);
void printGCWarning(); void printGCWarning();
void printMissing(StoreAPI & store, const PathSet & paths); void printMissing(StoreAPI & store, const PathSet & paths);

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

@ -64,9 +64,11 @@ void processExpr(EvalState & state, const Strings & attrPaths,
Path drvPath = i->queryDrvPath(state); Path drvPath = i->queryDrvPath(state);
if (gcRoot == "") if (gcRoot == "")
printGCWarning(); printGCWarning();
else else {
drvPath = addPermRoot(*store, drvPath, Path rootName = gcRoot;
makeRootName(gcRoot, rootNr), indirectRoot); if (++rootNr > 1) rootName += "-" + int2String(rootNr);
drvPath = addPermRoot(*store, drvPath, rootName, indirectRoot);
}
std::cout << format("%1%\n") % drvPath; std::cout << format("%1%\n") % drvPath;
} }
} }

10
src/nix-store/nix-store.cc
View file

@ -64,15 +64,19 @@ static PathSet realisePath(const Path & path)
if (isDerivation(path)) { if (isDerivation(path)) {
store->buildPaths(singleton<PathSet>(path)); store->buildPaths(singleton<PathSet>(path));
Derivation drv = derivationFromPath(*store, path); Derivation drv = derivationFromPath(*store, path);
rootNr++;
PathSet outputs; PathSet outputs;
foreach (DerivationOutputs::iterator, i, drv.outputs) { foreach (DerivationOutputs::iterator, i, drv.outputs) {
Path outPath = i->second.path; Path outPath = i->second.path;
if (gcRoot == "") if (gcRoot == "")
printGCWarning(); printGCWarning();
else else {
outPath = addPermRoot(*store, outPath, Path rootName = gcRoot;
makeRootName(gcRoot, rootNr), indirectRoot); if (rootNr > 1) rootName += "-" + int2String(rootNr);
if (i->first != "out") rootName += "-" + i->first;
outPath = addPermRoot(*store, outPath, rootName, indirectRoot);
}
outputs.insert(outPath); outputs.insert(outPath);
} }
return outputs; return outputs;