From bae4966c75cdc8db3235274b639f094bb4e22dea Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 30 Jun 2024 14:37:48 -0400
Subject: [PATCH 1/4] xrgears: move to by-name

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../xrgears/default.nix => by-name/xr/xrgears/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics/xrgears/default.nix => by-name/xr/xrgears/package.nix} (100%)

diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/by-name/xr/xrgears/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xrgears/default.nix
rename to pkgs/by-name/xr/xrgears/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e840bf055948..c884ef246cb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34622,8 +34622,6 @@ with pkgs;
 
   xrestop = callPackage ../tools/X11/xrestop { };
 
-  xrgears = callPackage ../applications/graphics/xrgears { };
-
   xsd = callPackage ../development/libraries/xsd {
     stdenv = gcc9Stdenv;
   };

From eb06dadfa09babd09f9b6ae56b75797225cd8962 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 18 Jun 2024 02:42:47 +0200
Subject: [PATCH 2/4] xrgears: add update script

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/xr/xrgears/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix
index cdb0977b4e97..068ad31a9542 100644
--- a/pkgs/by-name/xr/xrgears/package.nix
+++ b/pkgs/by-name/xr/xrgears/package.nix
@@ -13,6 +13,7 @@
 , makeWrapper
 , libGL
 , glib
+, unstableGitUpdater
 }:
 
 stdenv.mkDerivation rec {
@@ -49,12 +50,14 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]}
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears";
     description = "OpenXR example using Vulkan for rendering";
     mainProgram = "xrgears";
     platforms = platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [ expipiplus1 ];
+    maintainers = with maintainers; [ expipiplus1 Scrumplex ];
   };
 }

From f6a2e5adf17667f7afb192890d71f4001e8c30b1 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 18 Jun 2024 02:39:51 +0200
Subject: [PATCH 3/4] xrgears: unstable-2021-06-19 -> 1.0.1-unstable-2024-07-09

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/xr/xrgears/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix
index 068ad31a9542..2d60f6aa2ec6 100644
--- a/pkgs/by-name/xr/xrgears/package.nix
+++ b/pkgs/by-name/xr/xrgears/package.nix
@@ -16,16 +16,16 @@
 , unstableGitUpdater
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "xrgears";
-  version = "unstable-2021-06-19";
+  version = "1.0.1-unstable-2024-07-09";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "monado";
     repo = "demos/xrgears";
-    rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461";
-    sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc=";
+    rev = "9cabbd34b1f60f27402a9a50fc260f77a41b835b";
+    sha256 = "sha256-9VV1zAOZKkl1zzjnsQQQOINi+T+wpbltdWpJ/d66+cM=";
   };
 
   nativeBuildInputs = [

From 58a31f09b8d2b25035f9deb0face05890381daf3 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 7 Sep 2024 23:38:04 +0200
Subject: [PATCH 4/4] xrgears: format

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/xr/xrgears/package.nix | 46 ++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix
index 2d60f6aa2ec6..82a801a54be0 100644
--- a/pkgs/by-name/xr/xrgears/package.nix
+++ b/pkgs/by-name/xr/xrgears/package.nix
@@ -1,19 +1,21 @@
-{ lib, stdenv
-, fetchFromGitLab
-, glm
-, glslang
-, meson
-, ninja
-, openxr-loader
-, pkg-config
-, vulkan-headers
-, vulkan-loader
-, xxd
-, SDL2
-, makeWrapper
-, libGL
-, glib
-, unstableGitUpdater
+{
+  SDL2,
+  fetchFromGitLab,
+  glib,
+  glm,
+  glslang,
+  lib,
+  libGL,
+  makeWrapper,
+  meson,
+  ninja,
+  openxr-loader,
+  pkg-config,
+  stdenv,
+  unstableGitUpdater,
+  vulkan-headers,
+  vulkan-loader,
+  xxd,
 }:
 
 stdenv.mkDerivation {
@@ -47,7 +49,12 @@ stdenv.mkDerivation {
 
   fixupPhase = ''
     wrapProgram $out/bin/xrgears \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]}
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          SDL2
+          libGL
+        ]
+      }
   '';
 
   passthru.updateScript = unstableGitUpdater { };
@@ -58,6 +65,9 @@ stdenv.mkDerivation {
     mainProgram = "xrgears";
     platforms = platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [ expipiplus1 Scrumplex ];
+    maintainers = with maintainers; [
+      expipiplus1
+      Scrumplex
+    ];
   };
 }