From 39a7f3380aebda5be400b97b10fd61a70e95aaeb Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Sun, 10 Mar 2024 21:49:38 +0100
Subject: [PATCH 1/3] maintainers: add sodiboo

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 681e68781e55..c3b6bc1320e2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18104,6 +18104,12 @@
     githubId = 55726;
     name = "Stanislav Ochotnický";
   };
+  sodiboo = {
+    name = "sodiboo";
+    github = "sodiboo";
+    githubId = 37938646;
+    matrix = "@sodiboo:arcticfoxes.net";
+  };
   softinio = {
     email = "code@softinio.com";
     github = "softinio";

From 5e2f90e7a02c6b6733d271b617c4d3be1bb35f87 Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Sun, 10 Mar 2024 22:02:52 +0100
Subject: [PATCH 2/3] niri: add sodiboo as maintainer

---
 pkgs/by-name/ni/niri/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index e8bf2773b3b3..d9aeac8818ac 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec {
     description = "A scrollable-tiling Wayland compositor";
     homepage = "https://github.com/YaLTeR/niri";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iogamaster foo-dogsquared ];
+    maintainers = with maintainers; [ iogamaster foo-dogsquared sodiboo ];
     mainProgram = "niri";
     platforms = platforms.linux;
   };

From 7b78f6a375ea49be7f379ac5452057e8f350d01f Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Sun, 10 Mar 2024 22:04:10 +0100
Subject: [PATCH 3/3] niri: cherry-pick patch

a regression was introduced in the release of v0.1.3 and it is advised that packagers include this patch
---
 pkgs/by-name/ni/niri/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index d9aeac8818ac..e198d0585d2f 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -16,6 +16,7 @@
 , libclang
 , autoPatchelfHook
 , clang
+, fetchpatch
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -29,6 +30,14 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-VTtXEfxc3OCdtdYiEdtftOQ7gDJNb679Yw8v1Lu3lhY=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "revert-viewporter.patch";
+      url = "https://github.com/YaLTeR/niri/commit/40cec34aa4a7f99ab12b30cba1a0ee83a706a413.patch";
+      hash = "sha256-3fg8v0eotfjUQY6EVFEPK5BBIBrr6vQpXbjDcsw2E8Q=";
+    })
+  ];
+
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {