Merge pull request #1704 from lheckemann/buildenv-eol-fix

Fix "Unexpected EOF reading a line" error
NixOS · Nov 29, 2017 · cd74a55 · cd74a55
2 parents b52846a + f986a44
commit cd74a55
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/buildenv/buildenv.cc b/src/buildenv/buildenv.cc
@@ -115,9 +115,9 @@ static void addPkg(const Path & pkgDir, int priority)
                 return;
             throw SysError(format("opening '%1%'") % propagatedFN);
         }
-        propagated = readLine(fd.get());
+        propagated = readFile(fd.get());
     }
-    for (const auto & p : tokenizeString<std::vector<string>>(propagated, " "))
+    for (const auto & p : tokenizeString<std::vector<string>>(propagated, " \n"))
         if (done.find(p) == done.end())
             postponed.insert(p);
 }