From 4e6353bbf51c1438f5a9d2c862d9d5e2c9860dd2 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Thu, 14 Nov 2024 09:39:05 +0000
Subject: [PATCH] niri: 0.1.10 -> 0.1.10.1

(cherry picked from commit fade592271ec71bdb79d6c7bf8f6297ba6f9714b)
---
 pkgs/by-name/ni/niri/Cargo.lock  |  8 ++++----
 pkgs/by-name/ni/niri/package.nix | 15 +++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock
index 3534b4e95a06..fd237aeaa6fd 100644
--- a/pkgs/by-name/ni/niri/Cargo.lock
+++ b/pkgs/by-name/ni/niri/Cargo.lock
@@ -2390,7 +2390,7 @@ dependencies = [
 
 [[package]]
 name = "niri"
-version = "0.1.10"
+version = "0.1.10-1"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -2444,7 +2444,7 @@ dependencies = [
 
 [[package]]
 name = "niri-config"
-version = "0.1.10"
+version = "0.1.10-1"
 dependencies = [
  "bitflags 2.6.0",
  "csscolorparser",
@@ -2461,7 +2461,7 @@ dependencies = [
 
 [[package]]
 name = "niri-ipc"
-version = "0.1.10"
+version = "0.1.10-1"
 dependencies = [
  "clap",
  "schemars",
@@ -2471,7 +2471,7 @@ dependencies = [
 
 [[package]]
 name = "niri-visual-tests"
-version = "0.1.10"
+version = "0.1.10-1"
 dependencies = [
  "anyhow",
  "gtk4",
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index f60719785801..cf4a7c6b1433 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -4,7 +4,6 @@
   dbus,
   eudev,
   fetchFromGitHub,
-  fetchpatch,
   libdisplay-info,
   libglvnd,
   libinput,
@@ -26,23 +25,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "niri";
-  version = "0.1.10";
+  version = "0.1.10.1";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=";
+    hash = "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=";
   };
 
-  patches = [
-    # Fix scrolling not working with missing mouse config
-    (fetchpatch {
-      url = "https://github.com/YaLTeR/niri/commit/1951d2a9f262196a706f2645efb18dac3c4d6839.patch";
-      hash = "sha256-P/0LMYZ4HD0iG264BMnK4sLNNLmtbefF230GyC+t6qg=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs resources/niri-session
     substituteInPlace resources/niri.service \
@@ -52,8 +43,8 @@ rustPlatform.buildRustPackage rec {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U=";
       "libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk=";
+      "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U=";
     };
   };