maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/nix): added meson support

Browse source 
(cherry picked from commit 086a81b7a5bbe1fc022efb5935ff68f6ad71ddaf)
This commit is contained in:
p01arst0rm 2019-10-21 17:57:38 +01:00 • committed by Vincent Ambo
parent c455f7a987
commit 055139ac6a
27 changed files with 2045 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
third_party/nix/src/libutil/util.cc vendored
View file

@ -33,7 +33,7 @@
#endif
extern char * * environ;
extern char * * environ __attribute__((weak));
namespace nix {
@ -1179,7 +1179,7 @@ void _interrupted()
/* Block user interrupts while an exception is being handled.
Throwing an exception while another exception is being handled
kills the program! */
if (!interruptThrown && !std::uncaught_exception()) {
if (!interruptThrown && !std::uncaught_exceptions()) {
interruptThrown = true;
throw Interrupted("interrupted by the user");
}