* When finding live paths, the deriver need not be valid.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 7f0b079467..a2be189cc1 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -333,8 +333,11 @@ void collectGarbage(GCAction action, PathSet & result)
         for (PathSet::iterator i = livePaths.begin();
              i != livePaths.end(); ++i)
         {
+            /* Note that the deriver need not be valid (e.g., if we
+               previously ran the collector with `gcKeepDerivations'
+               turned off). */
             Path deriver = queryDeriver(noTxn, *i);
-            if (deriver != "")
+            if (deriver != "" && isValidPath(deriver))
                 computeFSClosure(deriver, livePaths);
         }
     }