From 0fdcb36005114a0b3526cdbe6c256bc6d96eb78b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 20 Aug 2025 11:18:53 +0200
Subject: [PATCH] nixos/public-inbox: fix inboxdir option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This wasn't consistently used — sometimes the default value was
hardcoded.
---
 nixos/modules/services/mail/public-inbox.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix
index c5cb4b699e43..9cd760b6260f 100644
--- a/nixos/modules/services/mail/public-inbox.nix
+++ b/nixos/modules/services/mail/public-inbox.nix
@@ -630,7 +630,7 @@ in
               ''
               + concatStrings (
                 mapAttrsToList (name: inbox: ''
-                  if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then
+                  if [ ! -e ${escapeShellArg inbox.inboxdir} ]; then
                     # public-inbox-init creates an inbox and adds it to a config file.
                     # It tries to atomically write the config file by creating
                     # another file in the same directory, and renaming it.
@@ -643,7 +643,7 @@ in
                       ${escapeShellArgs (
                         [
                           name
-                          "${stateDir}/inboxes/${name}"
+                          inbox.inboxdir
                           inbox.url
                         ]
                         ++ inbox.address
@@ -653,9 +653,9 @@ in
                   fi
 
                   ln -sf ${inbox.description} \
-                    ${stateDir}/inboxes/${escapeShellArg name}/description
+                    ${escapeShellArg inbox.inboxdir}/description
 
-                  export GIT_DIR=${stateDir}/inboxes/${escapeShellArg name}/all.git
+                  export GIT_DIR=${escapeShellArg inbox.inboxdir}/all.git
                   if test -d "$GIT_DIR"; then
                     # Config is inherited by each epoch repository,
                     # so just needs to be set for all.git.