From e39a2999310d7d3fdbf56d17121d503bcd4cdb10 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 5 Jan 2025 18:50:41 +0100
Subject: [PATCH 1/7] gpu-screen-recorder{,-gtk}: move to pkgs/by-name

---
 .../gp/gpu-screen-recorder-gtk/package.nix}                 | 0
 .../gp/gpu-screen-recorder/package.nix}                     | 0
 pkgs/top-level/all-packages.nix                             | 6 ------
 3 files changed, 6 deletions(-)
 rename pkgs/{applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix => by-name/gp/gpu-screen-recorder-gtk/package.nix} (100%)
 rename pkgs/{applications/video/gpu-screen-recorder/default.nix => by-name/gp/gpu-screen-recorder/package.nix} (100%)

diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
similarity index 100%
rename from pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
rename to pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
similarity index 100%
rename from pkgs/applications/video/gpu-screen-recorder/default.nix
rename to pkgs/by-name/gp/gpu-screen-recorder/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bf80e166da9..7a09f18c79b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12721,12 +12721,6 @@ with pkgs;
     withDoc = true;
   };
 
-  gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
-
-  gpu-screen-recorder-gtk =
-    callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix
-      { };
-
   gpxsee-qt5 = libsForQt5.callPackage ../applications/misc/gpxsee { };
 
   gpxsee-qt6 = qt6Packages.callPackage ../applications/misc/gpxsee { };

From 2f3a205f64a9123a02077582c76d59d2cf4eeb0c Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Mon, 23 Dec 2024 05:18:04 +0100
Subject: [PATCH 2/7] gpu-screen-recorder{,-gtk}: add passthru.updateScript

---
 pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix | 3 +++
 pkgs/by-name/gp/gpu-screen-recorder/package.nix     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index fe4b4a391135..c87fdc10a912 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -19,6 +19,7 @@
   wayland,
   wrapGAppsHook3,
   wrapperDir ? "/run/wrappers/bin",
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
       })
     '';
 
+  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; };
+
   meta = {
     changelog = "https://git.dec05eba.com/gpu-screen-recorder-gtk/tree/com.dec05eba.gpu_screen_recorder.appdata.xml#n82";
     description = "GTK frontend for gpu-screen-recorder.";
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index a508f27f8c48..65f97cac4de6 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -22,6 +22,7 @@
   libXrandr,
   libXfixes,
   wrapperDir ? "/run/wrappers/bin",
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -82,6 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
       --suffix PATH : "$out/bin"
   '';
 
+  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder"; };
+
   meta = {
     description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only";
     homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/";

From ee022814764a73749561b069ae3d677aea78ce44 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 5 Jan 2025 19:42:44 +0100
Subject: [PATCH 3/7] gpu-screen-recorder{,-gtk}: use fetchgit instead of
 fetchurl

---
 .../gp/gpu-screen-recorder-gtk/package.nix      | 17 ++++++++---------
 pkgs/by-name/gp/gpu-screen-recorder/package.nix | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index c87fdc10a912..d593aac17444 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchgit,
   pkg-config,
   addDriverRunpath,
   desktop-file-utils,
@@ -22,17 +22,16 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder-gtk";
   version = "5.1.6";
 
-  src = fetchurl {
-    url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-op5cDILQglVAW/oajc0rdrMC02JZZ8bdER1B1qWPkSk=";
+  src = fetchgit {
+    url = "https://repo.dec05eba.com/${pname}";
+    tag = version;
+    hash = "sha256-/0TyqSFBZ/6xwJnX8ePEQTSwrwgi5R8fmRw3wTS/6a8=";
   };
 
-  sourceRoot = ".";
-
   nativeBuildInputs = [
     desktop-file-utils
     pkg-config
@@ -69,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
       })
     '';
 
-  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     changelog = "https://git.dec05eba.com/gpu-screen-recorder-gtk/tree/com.dec05eba.gpu_screen_recorder.appdata.xml#n82";
@@ -80,4 +79,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ babbaj ];
     platforms = [ "x86_64-linux" ];
   };
-})
+}
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 65f97cac4de6..d6c2b043d11b 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchgit,
   makeWrapper,
   meson,
   ninja,
@@ -25,17 +25,16 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder";
   version = "5.2.0";
 
-  src = fetchurl {
-    url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz";
-    hash = "sha256-7aUW0WhoTpkJhj9WjjI2lnq+vOCG53vl/4DckHmLPBo=";
+  src = fetchgit {
+    url = "https://repo.dec05eba.com/${pname}";
+    tag = version;
+    hash = "sha256-8/EtO0nuretHWo7atgWXrmAPcvnYtdE06BkwlhbrNsI=";
   };
 
-  sourceRoot = ".";
-
   nativeBuildInputs = [
     pkg-config
     makeWrapper
@@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
       --suffix PATH : "$out/bin"
   '';
 
-  passthru.updateScript = gitUpdater { url = "https://repo.dec05eba.com/gpu-screen-recorder"; };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only";
@@ -93,4 +92,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ lib.maintainers.babbaj ];
     platforms = [ "x86_64-linux" ];
   };
-})
+}

From 9bfb3e72b7be38cc255e775cc22296b5f4b404b4 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 5 Jan 2025 19:40:09 +0100
Subject: [PATCH 4/7] gpu-screen-recorder{,-gtk}: add myself as maintainer

---
 pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix | 5 ++++-
 pkgs/by-name/gp/gpu-screen-recorder/package.nix     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index d593aac17444..11ced0c9a965 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -76,7 +76,10 @@ stdenv.mkDerivation rec {
     homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/";
     license = lib.licenses.gpl3Only;
     mainProgram = "gpu-screen-recorder-gtk";
-    maintainers = with lib.maintainers; [ babbaj ];
+    maintainers = with lib.maintainers; [
+      babbaj
+      js6pak
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index d6c2b043d11b..37faf6346b54 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -89,7 +89,10 @@ stdenv.mkDerivation rec {
     homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/";
     license = lib.licenses.gpl3Only;
     mainProgram = "gpu-screen-recorder";
-    maintainers = [ lib.maintainers.babbaj ];
+    maintainers = with lib.maintainers; [
+      babbaj
+      js6pak
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 6fe3a6135eb94799ca106aa38ba4c922d72709e7 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 2 Feb 2025 21:15:35 +0100
Subject: [PATCH 5/7] gpu-screen-recorder: 5.2.0 -> 5.5.3

---
 pkgs/by-name/gp/gpu-screen-recorder/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 37faf6346b54..538d9d32a7c8 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -12,6 +12,7 @@
   dbus,
   ffmpeg,
   wayland,
+  wayland-scanner,
   vulkan-headers,
   pipewire,
   libdrm,
@@ -27,12 +28,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder";
-  version = "5.2.0";
+  version = "5.5.3";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/${pname}";
     tag = version;
-    hash = "sha256-8/EtO0nuretHWo7atgWXrmAPcvnYtdE06BkwlhbrNsI=";
+    hash = "sha256-XXSHTS/WWqGblbBLuzHSYCY5FVTDSHBHfBWubmoNSy0=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     ffmpeg
     pipewire
     wayland
+    wayland-scanner
     vulkan-headers
     libdrm
     libva

From f18cf012cfef88a114ab2c414e6302fec9a5e929 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 11 May 2025 17:16:25 +0200
Subject: [PATCH 6/7] nixos/gpu-screen-recorder: add `cap_sys_nice` back

This reverts commit 7b69d089ca4c96096f06ed848d55a28e41d6b271, because gpu-screen-recorder 5.5.2 fixes the original issue.
---
 nixos/modules/programs/gpu-screen-recorder.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/programs/gpu-screen-recorder.nix b/nixos/modules/programs/gpu-screen-recorder.nix
index 5a9401943dfe..156123de7a38 100644
--- a/nixos/modules/programs/gpu-screen-recorder.nix
+++ b/nixos/modules/programs/gpu-screen-recorder.nix
@@ -34,6 +34,12 @@ in
       capabilities = "cap_sys_admin+ep";
       source = "${package}/bin/gsr-kms-server";
     };
+    security.wrappers."gpu-screen-recorder" = {
+      owner = "root";
+      group = "root";
+      capabilities = "cap_sys_nice+ep";
+      source = "${package}/bin/gpu-screen-recorder";
+    };
   };
 
   meta.maintainers = with lib.maintainers; [ timschumi ];

From 110d7b29b30208a6aaa4e95b8c878e3d6e4c0709 Mon Sep 17 00:00:00 2001
From: js6pak <me@6pak.dev>
Date: Sun, 2 Feb 2025 21:16:05 +0100
Subject: [PATCH 7/7] gpu-screen-recorder-gtk: 5.1.6 -> 5.7.0

---
 pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
index 11ced0c9a965..c887c7e01fbb 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder-gtk/package.nix
@@ -24,12 +24,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder-gtk";
-  version = "5.1.6";
+  version = "5.7.0";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/${pname}";
     tag = version;
-    hash = "sha256-/0TyqSFBZ/6xwJnX8ePEQTSwrwgi5R8fmRw3wTS/6a8=";
+    hash = "sha256-/s8FCV3hE7Gq1Ad6EhRNTZJwyskV+uRYvjJ43298AOw=";
   };
 
   nativeBuildInputs = [