diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b7be83f5d33c..8988fe5569c3 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -70,8 +70,24 @@ stdenv.mkDerivation rec {
       url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch";
       sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz";
     })
+
+    # lib, tests: use GioUnix to use platform-specific Gio classes
+    # https://github.com/awesomeWM/awesome/pull/4022
+    (fetchpatch {
+      name = "glib-2.86.0.patch";
+      url = "https://github.com/void-linux/void-packages/raw/933b305b313a2c7d971d746835deb9f49b652204/srcpkgs/awesome/patches/glib-2.86.0.patch";
+      hash = "sha256-qVzD8O34sULcV6S4daDUBPnxVDd8T6ZyLOE+gYxCmf0=";
+    })
   ];
 
+  # Fix build with CMake 4
+  # https://github.com/awesomeWM/awesome/pull/4030#issuecomment-3370822668
+  postPatch = ''
+    substituteInPlace {,tests/examples/}CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.0.0)' 'cmake_minimum_required(VERSION 3.10)' \
+      --replace-warn 'cmake_policy(VERSION 2.6)' 'cmake_policy(VERSION 3.10)'
+  '';
+
   nativeBuildInputs = [
     cmake
     doxygen
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index c0b710f89700..979cafdd18c7 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -298,6 +298,14 @@ in
         url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch";
         sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
       })
+
+      # https://github.com/lgi-devs/lgi/issues/346
+      # https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/issues/1
+      (fetchpatch {
+        name = "glib-2.86.0.patch";
+        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/raw/05a0c9df75883da235bacd4379b769e7d7713fb9/0001-Use-TypeClass.get-instead-of-.ref.patch";
+        hash = "sha256-Z1rNv0VzVrK41rV73KiPXq9yLaNxbTOFiSd6eLZyrbY=";
+      })
     ];
 
     # https://github.com/lgi-devs/lgi/pull/300