From 2c070a4be0f10e5db507f957bc9f3092bbfaa3ec Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 11 Feb 2025 12:30:42 -0500
Subject: [PATCH] refactor(gsr): clean up deriv and remove path warning

---
 .../cluster/modules/searxng/default.nix       |  2 +-
 packages/gpu-screen-recorder/generic.nix      | 24 ++++++++++++-------
 .../gpu-screen-recorder/gsr-kms-server.nix    |  1 +
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configurations/cluster/modules/searxng/default.nix b/configurations/cluster/modules/searxng/default.nix
index 7a0fda4d..db630719 100644
--- a/configurations/cluster/modules/searxng/default.nix
+++ b/configurations/cluster/modules/searxng/default.nix
@@ -11,7 +11,7 @@ in {
 
     package =
       (pkgs.searxng.override {
-        # FIXME: https://github.com/NixOS/nixpkgs/issues/380351
+        # FIXME: https://pr-tracker.nelim.org/?pr=381174
         python3 = pkgs.python3.override {
           packageOverrides = pyFinal: pyPrev: {
             httpx = pyPrev.httpx.overridePythonAttrs (o: rec {
diff --git a/packages/gpu-screen-recorder/generic.nix b/packages/gpu-screen-recorder/generic.nix
index 49521d36..5cf94de9 100644
--- a/packages/gpu-screen-recorder/generic.nix
+++ b/packages/gpu-screen-recorder/generic.nix
@@ -1,6 +1,10 @@
 {
-  lib,
+  # Params
+  pname,
   gpu-screen-recorder-src,
+  isKmsServer ? false,
+  # Derivation deps
+  lib,
   addDriverRunpath,
   dbus,
   ffmpeg,
@@ -17,7 +21,6 @@
   vulkan-headers,
   wayland,
   xorg,
-  pname,
   ...
 }: let
   inherit (lib) makeLibraryPath;
@@ -34,6 +37,11 @@ in
 
     src = gpu-screen-recorder-src;
 
+    # Get rid of useless warning
+    postPatch = ''
+      sed -i 's/.*gsr-kms-server is not installed in the same directory.*//' ./kms/client/kms_client.c
+    '';
+
     nativeBuildInputs = [
       pkg-config
       makeWrapper
@@ -79,17 +87,17 @@ in
     # This is needed to force gsr to lookup kms in PATH
     # to get the security wrapper
     postFixup =
-      if pname == "gpu-screen-recorder"
+      if isKmsServer
       then
-        # bash
-        ''
-          rm $out/bin/gsr-kms-server
-        ''
-      else
         # bash
         ''
           rm $out/bin/gpu-screen-recorder
           rm $out/bin/.gpu-screen-recorder-wrapped
+        ''
+      else
+        # bash
+        ''
+          rm $out/bin/gsr-kms-server
         '';
 
     meta = {
diff --git a/packages/gpu-screen-recorder/gsr-kms-server.nix b/packages/gpu-screen-recorder/gsr-kms-server.nix
index 5278c3eb..3264f1e1 100644
--- a/packages/gpu-screen-recorder/gsr-kms-server.nix
+++ b/packages/gpu-screen-recorder/gsr-kms-server.nix
@@ -5,5 +5,6 @@
 }:
 callPackage ./generic.nix {
   pname = "gsr-kms-server";
+  isKmsServer = true;
   inherit gpu-screen-recorder-src;
 }