lix-project/lix
20
57
Fork 31
Code Issues 351 Code Review (Gerrit) Projects 3 Releases Wiki Activity

More macOS build fixes

Browse source
This commit is contained in:
Eelco Dolstra 2017-08-31 12:52:07 +02:00
parent fabde432dc
commit 7d4a7136db
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/run.cc
View file

@ -16,6 +16,8 @@ using namespace nix;
std::string chrootHelperName = "__run_in_chroot"; std::string chrootHelperName = "__run_in_chroot";
extern char * * environ;
struct CmdRun : InstallablesCommand struct CmdRun : InstallablesCommand
{ {
Strings command = { "bash" }; Strings command = { "bash" };
@ -85,7 +87,7 @@ struct CmdRun : InstallablesCommand
if (s) kept[var] = s; if (s) kept[var] = s;
} }
clearenv(); environ = nullptr;
for (auto & var : kept) for (auto & var : kept)
setenv(var.first.c_str(), var.second.c_str(), 1); setenv(var.first.c_str(), var.second.c_str(), 1);