From bc445dc2b656596cd45c176ab0aeb35a8da8a3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@tweag.io>
Date: Mon, 26 Jun 2023 08:58:40 +0200
Subject: [PATCH] Remove the NIX_GC_SOCKET_PATH environment variable

Not really needed since it's configurable from the config (and people
can always use `$NIX_CONFIG` if they really need to configure it from
the CLI)
---
 src/libstore/globals.hh            | 2 +-
 tests/gc-external-daemon/common.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 2d2762ea4..ab65505b1 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -126,7 +126,7 @@ public:
 
     Setting<std::string> gcSocketPath {
         this,
-        getEnv("NIX_GC_SOCKET_PATH").value_or("auto"),
+        "auto",
         "gc-socket-path",
         "Path to the socket used to communicate with an external GC."
     };
diff --git a/tests/gc-external-daemon/common.sh b/tests/gc-external-daemon/common.sh
index 01e75e1bd..746de5c1a 100644
--- a/tests/gc-external-daemon/common.sh
+++ b/tests/gc-external-daemon/common.sh
@@ -1,5 +1,6 @@
 source ../common.sh
 
 enableFeatures "external-gc-daemon"
+echo "gc-socket-path = $NIX_GC_SOCKET_PATH" >> "$NIX_CONF_DIR"/nix.cong
 
 startGcDaemon