From 49d100ba8b5d65c6f2df909e53ec92ba279cfc4d Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 13 Jul 2024 01:00:06 +0200
Subject: [PATCH] dropEmptyInitThenConcatStringsSep -> concatStringSep: output
 name empty not feasible

I don't think it's completely impossible, but I can't construct
one easily as derivationStrict seems to (re)tokenize the outputs
attribute, dropping the empty output.

It's not a scenario we have to account for here.
---
 src/libstore/build/derivation-goal.cc | 2 +-
 src/libstore/outputs-spec.cc          | 3 ++-
 src/libstore/path-with-outputs.cc     | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index c0a784349..99d9cceda 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -1505,7 +1505,7 @@ std::pair<bool, SingleDrvOutputs> DerivationGoal::checkPathValidity()
     if (!wantedOutputsLeft.empty())
         throw Error("derivation '%s' does not have wanted outputs %s",
             worker.store.printStorePath(drvPath),
-            dropEmptyInitThenConcatStringsSep(", ", quoteStrings(wantedOutputsLeft)));
+            concatStringsSep(", ", quoteStrings(wantedOutputsLeft)));
 
     bool allValid = true;
     for (auto & [_, status] : initialOutputs) {
diff --git a/src/libstore/outputs-spec.cc b/src/libstore/outputs-spec.cc
index 4ed8f95ae..86788a87e 100644
--- a/src/libstore/outputs-spec.cc
+++ b/src/libstore/outputs-spec.cc
@@ -5,6 +5,7 @@
 #include "regex-combinators.hh"
 #include "outputs-spec.hh"
 #include "path-regex.hh"
+#include "strings-inline.hh"
 
 namespace nix {
 
@@ -83,7 +84,7 @@ std::string OutputsSpec::to_string() const
             return "*";
         },
         [&](const OutputsSpec::Names & outputNames) -> std::string {
-            return dropEmptyInitThenConcatStringsSep(",", outputNames);
+            return concatStringsSep(",", outputNames);
         },
     }, raw);
 }
diff --git a/src/libstore/path-with-outputs.cc b/src/libstore/path-with-outputs.cc
index 5fa38d5d9..161d023d1 100644
--- a/src/libstore/path-with-outputs.cc
+++ b/src/libstore/path-with-outputs.cc
@@ -1,7 +1,9 @@
+#include <regex>
+
 #include "path-with-outputs.hh"
 #include "store-api.hh"
+#include "strings.hh"
 
-#include <regex>
 
 namespace nix {
 
@@ -9,7 +11,7 @@ std::string StorePathWithOutputs::to_string(const StoreDirConfig & store) const
 {
     return outputs.empty()
         ? store.printStorePath(path)
-        : store.printStorePath(path) + "!" + dropEmptyInitThenConcatStringsSep(",", outputs);
+        : store.printStorePath(path) + "!" + concatStringsSep(",", outputs);
 }