the big one

modules/nixos/desktop/desktop-niri.ulu.nix

@@ -6,15 +6,15 @@
       programs.niri.enable = true;
       nixpkgs.overlays = [
         (final: prev: {
-          xwayland-satellite = prev.xwayland-satellite.overrideAttrs (old: {
-            patches = (old.patches or [ ]) ++ [
-              (final.fetchpatch {
-                name = "no-focus-for-override-redirect-popups.patch";
-                url = "https://github.com/Supreeeme/xwayland-satellite/pull/494.diff";
-                hash = "sha256-X7v6rAyTGE0e1UIbhL7XoYx5puZ0C9b+YAwIgT4Gyzk=";
+          xwayland-satellite =
+            if prev.lib.versionOlder prev.xwayland-satellite.version "0.8.3" then
+              prev.xwayland-satellite.overrideAttrs (old: {
+                patches = (old.patches or [ ]) ++ [
+                  ./xwayland-satellite-no-focus-override-redirect.patch
+                ];
               })
-            ];
-          });
+            else
+              prev.xwayland-satellite;
         })
       ];