This commit had been inadvertently reverted in 322eeb8. * nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Flush when the line contains '\r'.