From 24ec7500032c2434e450b7bc3f77ff4c1f12c41c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Feb 2018 18:29:40 +0100 Subject: nix run: Fix segfault on macOS Note that clearenv() is not available on macOS. Fixes #1907. --- src/nix/run.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nix/run.cc') diff --git a/src/nix/run.cc b/src/nix/run.cc index 822654daf488..d04e106e037b 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -16,8 +16,6 @@ using namespace nix; std::string chrootHelperName = "__run_in_chroot"; -extern char * * environ; - struct CmdRun : InstallablesCommand { std::vector command = { "bash" }; @@ -109,7 +107,7 @@ struct CmdRun : InstallablesCommand if (s) kept[var] = s; } - environ = nullptr; + clearEnv(); for (auto & var : kept) setenv(var.first.c_str(), var.second.c_str(), 1); -- cgit 1.4.1