From dd13ee734ba185d83f04ee01d1e789d0b4fc53d5 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 22 Feb 2025 10:04:52 +0100
Subject: [PATCH 1/3] niri: 25.01 -> 25.02

(cherry picked from commit 61ffcdafa9fe5f4e1237346ae521c038458254e5)
---
 pkgs/by-name/ni/niri/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 847f446628c51..9c987599243a2 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -24,13 +24,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "niri";
-  version = "25.01";
+  version = "25.02";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     tag = "v${version}";
-    hash = "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=";
+    hash = "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-eGI3i7FnjZGEfcGvEpNLOog8cgExBJuGoXM/oHsui0M=";
+  cargoHash = "sha256-xUjBQ65INi5qD7s5SpPw9TISgY6I3bjjUBmpubvM43I=";
 
   strictDeps = true;
 
@@ -104,8 +104,6 @@ rustPlatform.buildRustPackage rec {
 
   preCheck = ''
     export XDG_RUNTIME_DIR=$(mktemp -d)
-    # See https://github.com/YaLTeR/niri/issues/953
-    export RAYON_NUM_THREADS=1
   '';
 
   passthru = {

From b267ca545479703dc135d44a19bcce0bfd418b7e Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Mon, 24 Feb 2025 01:04:12 +0100
Subject: [PATCH 2/3] niri: remove XDG_RUNTIME_DIR in check phase

no longer necessary:
https://github.com/YaLTeR/niri/commit/0226d9aec2fabc215c1bff8f7d37260370b5ad07

(cherry picked from commit 5177d2e4b0805ab48c03dfa0c625cf444208ebdb)
---
 pkgs/by-name/ni/niri/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 9c987599243a2..a6bd687745851 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -102,10 +102,6 @@ rustPlatform.buildRustPackage rec {
     );
   };
 
-  preCheck = ''
-    export XDG_RUNTIME_DIR=$(mktemp -d)
-  '';
-
   passthru = {
     providedSessions = [ "niri" ];
     updateScript = nix-update-script { };

From cc5eed6fdf32fd9f527957bec80b6bae683572ad Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 22 Feb 2025 10:14:21 +0100
Subject: [PATCH 3/3] niri: add versionCheckHook

(cherry picked from commit 92a55af5c56ef5d5ce31ad9c2a75e79fab4a1f88)
---
 pkgs/by-name/ni/niri/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index a6bd687745851..bfc76a616612d 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -8,6 +8,7 @@
   libinput,
   libxkbcommon,
   mesa,
+  versionCheckHook,
   nix-update-script,
   pango,
   pipewire,
@@ -102,6 +103,10 @@ rustPlatform.buildRustPackage rec {
     );
   };
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     providedSessions = [ "niri" ];
     updateScript = nix-update-script { };