mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-build: Fix regression causing all outputs to be built

Browse source
This commit is contained in:
Eelco Dolstra 2017-07-28 15:03:59 +02:00
parent af4689f9e9
commit c7654bc491
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -453,13 +453,13 @@ void mainWrapped(int argc, char * * argv)
for (auto & drvInfo : drvs) { for (auto & drvInfo : drvs) {
auto drvPath = drvInfo.queryDrvPath(); auto drvPath = drvInfo.queryDrvPath();
pathsToBuild.insert(drvPath); auto outPath = drvInfo.queryOutPath();
auto outputName = drvInfo.queryOutputName(); auto outputName = drvInfo.queryOutputName();
if (outputName == "") if (outputName == "")
throw Error("derivation ‘%s’ lacks an ‘outputName’ attribute", drvPath); throw Error("derivation ‘%s’ lacks an ‘outputName’ attribute", drvPath);
pathsToBuild.insert(drvPath + (outputName != "out" ? "!" + outputName : "")); pathsToBuild.insert(drvPath + "!" + outputName);
std::string drvPrefix; std::string drvPrefix;
auto i = drvPrefixes.find(drvPath); auto i = drvPrefixes.find(drvPath);
@ -475,8 +475,8 @@ void mainWrapped(int argc, char * * argv)
std::string symlink = drvPrefix; std::string symlink = drvPrefix;
if (outputName != "out") symlink += "-" + outputName; if (outputName != "out") symlink += "-" + outputName;
resultSymlinks[symlink] = drvInfo.queryOutPath(); resultSymlinks[symlink] = outPath;
outPaths.push_back(drvInfo.queryOutPath()); outPaths.push_back(outPath);
} }
buildPaths(pathsToBuild); buildPaths(pathsToBuild);