diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:17:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:27:15 +0200 |
| commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
| tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /nix/libstore/gc.cc | |
| parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
| parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
| download | guix-patches-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar guix-patches-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/gc.cc')
| -rw-r--r-- | nix/libstore/gc.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 46171e116c..c466996668 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -339,14 +339,11 @@ Roots LocalStore::findRoots() static void addAdditionalRoots(StoreAPI & store, PathSet & roots) { - Path rootFinder = getEnv("NIX_ROOT_FINDER", - settings.nixLibexecDir + "/list-runtime-roots"); + debug(format("executing `%1% gc --list-busy' to find additional roots") + % settings.guixProgram); - if (rootFinder.empty()) return; - - debug(format("executing `%1%' to find additional roots") % rootFinder); - - string result = runProgram(rootFinder); + const Strings args = { "gc", "--list-busy" }; + string result = runProgram(settings.guixProgram, false, args); StringSet paths = tokenizeString<StringSet>(result, "\n"); |