1 files changed, 1 insertions, 45 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 2c0fcc897..97d53ca63 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -4,6 +4,7 @@
 #include "serialise.hh"
 #include "cgroup.hh"
 #include "signals.hh"
+#include "environment-variables.hh"
 
 #include <array>
 #include <cctype>
@@ -43,57 +44,12 @@
 #endif
 
 
-extern char * * environ __attribute__((weak));
-
-
 #ifdef NDEBUG
 #error "Lix may not be built with assertions disabled (i.e. with -DNDEBUG)."
 #endif
 
 namespace nix {
 
-std::optional<std::string> getEnv(const std::string & key)
-{
-    char * value = getenv(key.c_str());
-    if (!value) return {};
-    return std::string(value);
-}
-
-std::optional<std::string> getEnvNonEmpty(const std::string & key) {
-    auto value = getEnv(key);
-    if (value == "") return {};
-    return value;
-}
-
-std::map<std::string, std::string> getEnv()
-{
-    std::map<std::string, std::string> env;
-    for (size_t i = 0; environ[i]; ++i) {
-        auto s = environ[i];
-        auto eq = strchr(s, '=');
-        if (!eq)
-            // invalid env, just keep going
-            continue;
-        env.emplace(std::string(s, eq), std::string(eq + 1));
-    }
-    return env;
-}
-
-
-void clearEnv()
-{
-    for (auto & name : getEnv())
-        unsetenv(name.first.c_str());
-}
-
-void replaceEnv(const std::map<std::string, std::string> & newEnv)
-{
-    clearEnv();
-    for (auto & newEnvVar : newEnv)
-        setenv(newEnvVar.first.c_str(), newEnvVar.second.c_str(), 1);
-}
-
-
 Path absPath(Path path, std::optional<PathView> dir, bool resolveSymlinks)
 {
     if (path.empty() || path[0] != '/') {