Fix Darwin build
Done slightly differently from https://github.com/NixOS/nix/pull/1093.
This commit is contained in:
parent
af3db853fa
commit
19c278de89
2 changed files with 6 additions and 6 deletions
|
@ -1,5 +1,3 @@
|
|||
#define _XOPEN_SOURCE 600
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <cerrno>
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
|
||||
using namespace nix;
|
||||
|
||||
extern char * * environ;
|
||||
|
||||
/* Recreate the effect of the perl shellwords function, breaking up a
|
||||
* string into arguments like a shell word, including escapes
|
||||
*/
|
||||
|
@ -448,9 +450,10 @@ int main(int argc, char ** argv)
|
|||
? Strings{"bash", "--rcfile", rcfile}
|
||||
: Strings{"bash", rcfile};
|
||||
|
||||
execvpe(getEnv("NIX_BUILD_SHELL", "bash").c_str(),
|
||||
stringsToCharPtrs(args).data(),
|
||||
stringsToCharPtrs(envStrs).data());
|
||||
environ = stringsToCharPtrs(envStrs).data();
|
||||
|
||||
execvp(getEnv("NIX_BUILD_SHELL", "bash").c_str(),
|
||||
stringsToCharPtrs(args).data());
|
||||
|
||||
throw SysError("executing shell");
|
||||
}
|
||||
|
@ -507,4 +510,3 @@ int main(int argc, char ** argv)
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue