From cf0b15a4b6c4bcebffa7ee2309d8126a1a089ea7 Mon Sep 17 00:00:00 2001
From: samhatter <sammyvincent2001@gmail.com>
Date: Wed, 14 May 2025 20:19:16 -0700
Subject: [PATCH 1/2] plex-desktop: adding StartupWMClass to .desktop file

---
 pkgs/by-name/pl/plex-desktop/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix
index 6dae4b0a9212..aa415c458fb5 100644
--- a/pkgs/by-name/pl/plex-desktop/package.nix
+++ b/pkgs/by-name/pl/plex-desktop/package.nix
@@ -13,6 +13,7 @@
   libva,
   libxkbcommon,
   libxml2_13,
+  makeDesktopItem,
   makeShellWrapper,
   minizip,
   nss,
@@ -40,6 +41,15 @@ let
     platforms = [ "x86_64-linux" ];
     mainProgram = "plex-desktop";
   };
+  desktopItem = makeDesktopItem {
+    name = "plex-desktop";
+    desktopName = "Plex";
+    exec = "plex-desktop";
+    icon = "${plex-desktop}/meta/gui/icon.png";
+    terminal = false;
+    categories = [ "AudioVideo" ];
+    startupWMClass = "Plex";
+  };
   plex-desktop = stdenv.mkDerivation {
     inherit pname version meta;
 
@@ -133,11 +143,8 @@ buildFHSEnv {
 
   extraInstallCommands = ''
     mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps
-    install -m 444 -D ${plex-desktop}/meta/gui/plex-desktop.desktop $out/share/applications/plex-desktop.desktop
-    substituteInPlace $out/share/applications/plex-desktop.desktop \
-      --replace-fail \
-      'Icon=''${SNAP}/meta/gui/icon.png' \
-      'Icon=${plex-desktop}/meta/gui/icon.png'
+    install -m 444 -D ${desktopItem}/share/applications/plex-desktop.desktop $out/share/applications/plex-desktop.desktop
+    install -m 444 -D ${plex-desktop}/meta/gui/icon.png $out/share/icons/hicolor/scalable/apps/plex-desktop.png
   '';
 
   runScript = writeShellScript "plex-desktop.sh" ''

From 75446c7cc8c4fff5e9d274973fac92bcc0177040 Mon Sep 17 00:00:00 2001
From: samhatter <sammyvincent2001@gmail.com>
Date: Sun, 28 Dec 2025 11:43:06 -0800
Subject: [PATCH 2/2] plex-desktop: making icon desktop entry generic reference

---
 pkgs/by-name/pl/plex-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix
index aa415c458fb5..a3a12c8e3598 100644
--- a/pkgs/by-name/pl/plex-desktop/package.nix
+++ b/pkgs/by-name/pl/plex-desktop/package.nix
@@ -45,7 +45,7 @@ let
     name = "plex-desktop";
     desktopName = "Plex";
     exec = "plex-desktop";
-    icon = "${plex-desktop}/meta/gui/icon.png";
+    icon = "plex-desktop";
     terminal = false;
     categories = [ "AudioVideo" ];
     startupWMClass = "Plex";