More macOS build fixes

edolstra · edolstra · commit 7d4a7136dba7 · 2017-08-31T12:52:07.000+02:00
diff --git a/src/nix/run.cc b/src/nix/run.cc
@@ -16,6 +16,8 @@ using namespace nix;
 
 std::string chrootHelperName = "__run_in_chroot";
 
+extern char * * environ;
+
 struct CmdRun : InstallablesCommand
 {
     Strings command = { "bash" };
@@ -85,7 +87,7 @@ struct CmdRun : InstallablesCommand
                 if (s) kept[var] = s;
             }
 
-            clearenv();
+            environ = nullptr;
 
             for (auto & var : kept)
                 setenv(var.first.c_str(), var.second.c_str(), 1);

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ using namespace nix;`
`16`	`16`
`17`	`17`	`std::string chrootHelperName = "__run_in_chroot";`
`18`	`18`
	`19`	`+extern char * * environ;`
	`20`	`+`
`19`	`21`	`struct CmdRun : InstallablesCommand`
`20`	`22`	`{`
`21`	`23`	`Strings command = { "bash" };`
`@@ -85,7 +87,7 @@ struct CmdRun : InstallablesCommand`
`85`	`87`	`if (s) kept[var] = s;`
`86`	`88`	`}`
`87`	`89`
`88`		`- clearenv();`
	`90`	`+ environ = nullptr;`
`89`	`91`
`90`	`92`	`for (auto & var : kept)`
`91`	`93`	`setenv(var.first.c_str(), var.second.c_str(), 1);`