From 3ae9ad849601c5ae881c1bf6bd93e584af0db2c3 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 3 Aug 2025 14:40:33 +0200
Subject: [PATCH 1/2] xrizer: 0.2 -> 0.3

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 71602948dc344989e599425b787c114ab15c4636)
---
 pkgs/by-name/xr/xrizer/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xr/xrizer/package.nix b/pkgs/by-name/xr/xrizer/package.nix
index e22ef2cd5902..fd53cea749ca 100644
--- a/pkgs/by-name/xr/xrizer/package.nix
+++ b/pkgs/by-name/xr/xrizer/package.nix
@@ -1,5 +1,6 @@
 {
   fetchFromGitHub,
+  fetchpatch2,
   lib,
   libGL,
   libxkbcommon,
@@ -12,16 +13,24 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xrizer";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "Supreeeme";
     repo = "xrizer";
     tag = "v${version}";
-    hash = "sha256-0RICNxF8RBHthve69Z9msTg2+jegg5K4aHYRF0YZ8a4=";
+    hash = "sha256-o6/uGbczYp5t6trjFIltZAMSM61adn+BvNb1fBhBSsk=";
   };
 
-  cargoHash = "sha256-87JcULH1tAA487VwKVBmXhYTXCdMoYM3gOQTkM53ehE=";
+  patches = [
+    (fetchpatch2 {
+      name = "xrizer-fix-flaky-tests.patch";
+      url = "https://github.com/Supreeeme/xrizer/commit/f58d797e75a8d920982abeaeedee83877dd3c493.diff?full_index=1";
+      hash = "sha256-TI++ZY7QX1iaj3WT0woXApSY2Tairraao5kzF77ewYY=";
+    })
+  ];
+
+  cargoHash = "sha256-kXcnD98ZaqRAA3jQvIoWSRC37Uq8l5PUYEzubxfMuUI=";
 
   nativeBuildInputs = [
     pkg-config

From f97c3af42d7c5bfc07503800e96d73dcee48c57f Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 3 Sep 2025 08:19:17 +0200
Subject: [PATCH 2/2] xrizer: support aarch64-linux and i686-linux

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 9e72d5556bd14477bc41951132f7c93eb4b23f94)
---
 pkgs/by-name/xr/xrizer/package.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/xr/xrizer/package.nix b/pkgs/by-name/xr/xrizer/package.nix
index fd53cea749ca..40796824ac14 100644
--- a/pkgs/by-name/xr/xrizer/package.nix
+++ b/pkgs/by-name/xr/xrizer/package.nix
@@ -10,6 +10,7 @@
   rustPlatform,
   shaderc,
   vulkan-loader,
+  stdenv,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xrizer";
@@ -52,10 +53,18 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postInstall = ''
-    mkdir -p $out/lib/xrizer/bin/linux64
-    ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/bin/linux64/vrclient.so"
+    mkdir -p $out/lib/xrizer/$platformPath
+    ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/$platformPath/vrclient.so"
   '';
 
+  platformPath =
+    {
+      "aarch64-linux" = "bin/linuxarm64";
+      "i686-linux" = "bin";
+      "x86_64-linux" = "bin/linux64";
+    }
+    ."${stdenv.hostPlatform.system}";
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -63,9 +72,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Supreeeme/xrizer";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ Scrumplex ];
-    # TODO: support more systems
-    # To do so, we need to map systems to the format openvr expects.
-    # i.e. x86_64-linux -> linux64, aarch64-linux -> linuxarm64
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+      "aarch64-linux"
+    ];
   };
 }