From 4db7046b7f8accc66c81ec9f454cb8695532a31f Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Sat, 11 Nov 2023 22:27:22 +0000
Subject: [PATCH 1/4] mpvScripts.buildLua: Strip `pname` when inferring
 `scriptName`

---
 pkgs/applications/video/mpv/scripts/buildLua.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix
index 4c1e1957c097..c7f510253f94 100644
--- a/pkgs/applications/video/mpv/scripts/buildLua.nix
+++ b/pkgs/applications/video/mpv/scripts/buildLua.nix
@@ -20,11 +20,17 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy
   , extraScripts ? []
   , ... }@args:
   let
+    strippedName = with builtins;
+      let groups = match "mpv[-_](.*)" pname; in
+      if groups != null
+      then head groups
+      else pname
+    ;
     # either passthru.scriptName, inferred from scriptPath, or from pname
     scriptName = (args.passthru or {}).scriptName or (
       if args ? scriptPath
       then fileName args.scriptPath
-      else "${pname}.lua"
+      else "${strippedName}.lua"
     );
     scriptPath = args.scriptPath or "./${scriptName}";
   in {

From 6b2a19c707ee8c575616a605c355de4d1f781b22 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Sat, 11 Nov 2023 22:30:59 +0000
Subject: [PATCH 2/4] mpvScripts.mpv-playlistmanager: Simplify after `buildLua`
 change

---
 pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
index 8ec05a3cf691..c164bae1495d 100644
--- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
+++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
@@ -17,8 +17,6 @@ buildLua rec {
       'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
   '';
 
-  scriptPath = "playlistmanager.lua";
-
   meta = with lib; {
     description = "Mpv lua script to create and manage playlists";
     homepage = "https://github.com/jonniek/mpv-playlistmanager";

From 5c3a58bbcf5799bac071367022788d63fc531141 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Sat, 11 Nov 2023 22:31:00 +0000
Subject: [PATCH 3/4] mpvScripts.quality-menu: Simplify after `buildLua` change

---
 pkgs/applications/video/mpv/scripts/quality-menu.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix
index e4d82d17ca39..8b9aadaccbc7 100644
--- a/pkgs/applications/video/mpv/scripts/quality-menu.nix
+++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix
@@ -15,7 +15,6 @@ buildLua rec {
     hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns=";
   };
 
-  scriptPath = "quality-menu.lua";
   extraScripts = lib.optional oscSupport "quality-menu-osc.lua";
 
   meta = with lib; {

From ffc274f6989a13bf6a32ec041938f5358c1bd5b8 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Wed, 29 Nov 2023 11:04:50 +0000
Subject: [PATCH 4/4] mpvScripts.thumbfast: Simplify after `buildLua` change

---
 pkgs/applications/video/mpv/scripts/thumbfast.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix
index 4899f556e8b2..3ddb701f6d1d 100644
--- a/pkgs/applications/video/mpv/scripts/thumbfast.nix
+++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix
@@ -11,8 +11,6 @@ buildLua {
     hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c=";
   };
 
-  scriptPath = "thumbfast.lua";
-
   passthru.extraWrapperArgs = [
     "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin"
   ];