* Allow unprivileged users to run the garbage collector and to do

  `nix-store --delete'.  But unprivileged users are not allowed to
  ignore liveness.
* `nix-store --delete --ignore-liveness': ignore the runtime roots as
  well.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index eb037bda1913..701e8397427b 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -3,7 +3,6 @@
 
 #include "globals.hh"
 #include "misc.hh"
-#include "gc.hh"
 #include "archive.hh"
 #include "shared.hh"
 #include "dotgraph.hh"
@@ -573,7 +572,7 @@ static void opGC(Strings opFlags, Strings opArgs)
     PathSet result;
     PrintFreed freed(action == gcDeleteDead || action == gcReturnDead,
         action == gcReturnDead);
-    collectGarbage(action, PathSet(), false, result, freed.bytesFreed);
+    store->collectGarbage(action, PathSet(), false, result, freed.bytesFreed);
 
     if (action != gcDeleteDead) {
         for (PathSet::iterator i = result.begin(); i != result.end(); ++i)
@@ -601,7 +600,7 @@ static void opDelete(Strings opFlags, Strings opArgs)
     
     PathSet dummy;
     PrintFreed freed(true, false);
-    collectGarbage(gcDeleteSpecific, pathsToDelete, ignoreLiveness,
+    store->collectGarbage(gcDeleteSpecific, pathsToDelete, ignoreLiveness,
         dummy, freed.bytesFreed);
 }