From 70afaeebca9f27a7f85fa930c5c954f680cb5f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 17 Sep 2022 10:48:25 +0200
Subject: [PATCH 1/2] avoid shadowing metaName

---
 src/nix-eval-jobs.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc
index 68b6416..a8d56ab 100644
--- a/src/nix-eval-jobs.cc
+++ b/src/nix-eval-jobs.cc
@@ -217,11 +217,11 @@ struct Drv {
 
         if (myArgs.meta) {
             nlohmann::json meta_;
-            for (auto &name : drvInfo.queryMetaNames()) {
+            for (auto &metaName : drvInfo.queryMetaNames()) {
                 PathSet context;
                 std::stringstream ss;
 
-                auto metaValue = drvInfo.queryMeta(name);
+                auto metaValue = drvInfo.queryMeta(metaName);
                 // Skip non-serialisable types
                 // TODO: Fix serialisation of derivations to store paths
                 if (metaValue == 0) {
@@ -230,7 +230,7 @@ struct Drv {
 
                 printValueAsJSON(state, true, *metaValue, noPos, ss, context);
 
-                meta_[name] = nlohmann::json::parse(ss.str());
+                meta_[metaName] = nlohmann::json::parse(ss.str());
             }
             meta = meta_;
         }

From 47a74fed83c4ea0985b50ee45bd8fe722c3c18f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 20 Sep 2022 20:12:55 +0200
Subject: [PATCH 2/2] also accept relative gc root directories

---
 src/nix-eval-jobs.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc
index a8d56ab..e20ed5c 100644
--- a/src/nix-eval-jobs.cc
+++ b/src/nix-eval-jobs.cc
@@ -1,6 +1,7 @@
 #include <map>
 #include <iostream>
 #include <thread>
+#include <filesystem>
 
 #include <nix/config.h>
 #include <nix/shared.hh>
@@ -535,8 +536,11 @@ int main(int argc, char **argv) {
         if (myArgs.releaseExpr == "")
             throw UsageError("no expression specified");
 
-        if (myArgs.gcRootsDir == "")
+        if (myArgs.gcRootsDir == "") {
             printMsg(lvlError, "warning: `--gc-roots-dir' not specified");
+        } else {
+            myArgs.gcRootsDir = std::filesystem::absolute(myArgs.gcRootsDir);
+        }
 
         if (myArgs.showTrace) {
             loggerSettings.showTrace.assign(true);