pkgs/i3bar-river-patched: Base on my branch and rebase the block in middle patch

This should avoid having to update both of the patches in the future, as
the pull request patch fetch is not stable, and changes if I push
something new to the pr.

1 files changed, 6 insertions, 15 deletions

diff --git a/pkgs/by-name/i3/i3bar-river-patched/package.nix b/pkgs/by-name/i3/i3bar-river-patched/package.nix
index 87f78248..f6c3b5fd 100644
--- a/pkgs/by-name/i3/i3bar-river-patched/package.nix
+++ b/pkgs/by-name/i3/i3bar-river-patched/package.nix
@@ -13,32 +13,23 @@
   rustPlatform,
   pkg-config,
   pango,
-  fetchpatch2,
 }:
 rustPlatform.buildRustPackage {
   pname = "i3bar-river-patched";
   version = "1.1.0-unstable-2025-05-20";
 
   src = fetchFromGitHub {
-    owner = "MaxVerevkin";
+    owner = "bpeetz";
     repo = "i3bar-river";
-    rev = "73446cac559b10adf4beb5567a816d1be5273457";
-    hash = "sha256-NxlFKTnd2erHtSG56aWlZEkWVzBqe2hqQuVAWDdBq2c=";
+    rev = "bdaf362f24c143beeb92b783af15d3b99a0490e4";
+    hash = "sha256-jOv/DmXBpUCV/zbkWSKSYQ+yXcZZQY+T03rNre9hjn8=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-8sub8cXC/1iDY6v/9opO4FiLAo9CFrGJSDPNQydGvhQ=";
+  cargoHash = "sha256-jIB4XH67FmtPxAatHkuW8v5mNgr/KsyriaBNZ5t2dLo=";
 
   cargoPatches = [
-    # Add a separate theme for unfocused outputs.
-    (fetchpatch2 {
-      name = "Add support for special theme for unfocused outputs";
-      url = "https://patch-diff.githubusercontent.com/raw/MaxVerevkin/i3bar-river/pull/44.patch";
-      hash = "sha256-HMNR/4Q2wDnqbN0ziXrG5DFeWgczOcw5AzLvGbJZKdo=";
-    })
-
-    # TODO(@bpeetz): Open an issues, whether something like that could be upstreamed. <2025-05-20>
-    ./0002-feat-crate-bar-Put-the-leftmost-block-in-the-middle-.patch
+    # TODO(@bpeetz): Open an issues, whether something like that could be up-streamed. <2025-05-20>
+    ./0001-feat-crate-bar-Put-the-leftmost-block-in-the-middle-.patch
   ];
 
   # Remove the WMs that I don't use.