From 5e9551e662d86dc1b3673bb1f7f641afaa96fafc Mon Sep 17 00:00:00 2001
From: Raito Bezarius <raito@lix.systems>
Date: Sun, 6 Jul 2025 16:24:40 +0200
Subject: [PATCH] gosh

Change-Id: I92dba73610fbdc9fc67ba6590e828a7bed869d28
Signed-off-by: Raito Bezarius <raito@lix.systems>
---
 lix/libmain/shared.cc | 3 ---
 lix/nix/main.cc       | 2 ++
 meson.build           | 1 +
 misc/capnproto.nix    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lix/libmain/shared.cc b/lix/libmain/shared.cc
index 5ac7df087..2390a1ac1 100644
--- a/lix/libmain/shared.cc
+++ b/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)
diff --git a/lix/nix/main.cc b/lix/nix/main.cc
index b054e4883..abd8679f0 100644
--- a/lix/nix/main.cc
+++ b/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);
     });
diff --git a/meson.build b/meson.build
index adcea1142..b6af57f68 100644
--- a/meson.build
+++ b/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',
 )
 
diff --git a/misc/capnproto.nix b/misc/capnproto.nix
index 4100290de..7ee76f16b 100644
--- a/misc/capnproto.nix
+++ b/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;