gosh

Change-Id: I92dba73610fbdc9fc67ba6590e828a7bed869d28
Signed-off-by: Raito Bezarius <raito@lix.systems>

lix/libmain/shared.cc

@@ -130,8 +130,6 @@ static void sigHandler(int signo) { }
 
 void initNix()
 {
-    kj::UnixEventPort::setReservedSignal(KJ_RESERVED_SIGNAL);
-
     registerCrashHandler();
 
     /* Turn on buffering for cerr. */
@@ -189,7 +187,6 @@ void initNix()
     umask(0022);
 }
 
-
 LegacyArgs::LegacyArgs(AsyncIoRoot & aio, const std::string & programName,
     std::function<bool(Strings::iterator & arg, const Strings::iterator & end)> parseArg)
     : MixCommonArgs(programName), aio_(aio), parseArg(parseArg)

lix/nix/main.cc

@@ -13,6 +13,7 @@
 #include "lix/libutil/finally.hh"
 #include "lix/libutil/json.hh"
 #include "lix/libmain/loggers.hh"
+#include "lix/libutil/signals.hh"
 #include "lix/libcmd/markdown.hh"
 #include "add-to-store.hh"
 #include "build-remote.hh"
@@ -646,6 +647,7 @@ int main(int argc, char * * argv)
     nix::setStackSize(64 * 1024 * 1024);
 
     return nix::handleExceptions(argv[0], [&]() {
+        kj::UnixEventPort::setReservedSignal(nix::KJ_RESERVED_SIGNAL);
         nix::AsyncIoRoot aio;
         nix::mainWrapped(aio, argc, argv);
     });

meson.build

@@ -145,6 +145,7 @@ cxx = meson.get_compiler('cpp')
 # without being forced to hide the headers we take these defines from
 add_project_arguments(
   '-DLIX_UR_COMPILER_UWU',
+  '-DKJ_USE_KQUEUE=0',
   language : 'cpp',
 )
 

misc/capnproto.nix

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   env = {
     # Required to build the coroutine library
-    CXXFLAGS = "-std=c++20";
+    CXXFLAGS = "-std=c++20 -DKJ_USE_KQUEUE=0";
   };
 
   separateDebugInfo = true;