From 76b2d5ef3ddd876fbe825f5804f1331dfcf2ecfe Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 13 Jul 2024 01:49:34 +0200
Subject: [PATCH] dropEmptyInitThenConcatStringsSep -> concatStringSep: PATH
 handling

It's still wrong, but one step closer to correct.
Not that anyone should use "" or "." in their PATH, but that is not
for us to intervene.
---
 src/nix/env.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nix/env.cc b/src/nix/env.cc
index 7cc019c1d..bc4e1b5e5 100644
--- a/src/nix/env.cc
+++ b/src/nix/env.cc
@@ -3,6 +3,7 @@
 
 #include "command.hh"
 #include "run.hh"
+#include "strings.hh"
 
 using namespace nix;
 
@@ -92,9 +93,10 @@ struct CmdShell : InstallablesCommand, MixEnvironment
             }
         }
 
+        // TODO: split losslessly; empty means .
         auto unixPath = tokenizeString<Strings>(getEnv("PATH").value_or(""), ":");
         unixPath.insert(unixPath.begin(), pathAdditions.begin(), pathAdditions.end());
-        auto unixPathString = dropEmptyInitThenConcatStringsSep(":", unixPath);
+        auto unixPathString = concatStringsSep(":", unixPath);
         setEnv("PATH", unixPathString.c_str());
 
         Strings args;