mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Darwin build

Browse source 
Done slightly differently from https://github.com/NixOS/nix/pull/1093.
This commit is contained in:
Eelco Dolstra 2016-10-19 15:21:18 +02:00
parent af3db853fa
commit 19c278de89
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/archive.cc
View file

@ -1,5 +1,3 @@
#define _XOPEN_SOURCE 600
#include "config.h" #include "config.h"
#include <cerrno> #include <cerrno>

10
src/nix-build/nix-build.cc
View file

@ -16,6 +16,8 @@
using namespace nix; using namespace nix;
extern char * * environ;
/* Recreate the effect of the perl shellwords function, breaking up a /* Recreate the effect of the perl shellwords function, breaking up a
* string into arguments like a shell word, including escapes * 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", rcfile}
: Strings{"bash", rcfile}; : Strings{"bash", rcfile};
execvpe(getEnv("NIX_BUILD_SHELL", "bash").c_str(), environ = stringsToCharPtrs(envStrs).data();
stringsToCharPtrs(args).data(),
stringsToCharPtrs(envStrs).data()); execvp(getEnv("NIX_BUILD_SHELL", "bash").c_str(),
stringsToCharPtrs(args).data());
throw SysError("executing shell"); throw SysError("executing shell");
} }
@ -507,4 +510,3 @@ int main(int argc, char ** argv)
} }
}); });
} }