From a4dd202be53cc59a43d46561f00ebc5203428a0a Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 12 Dec 2023 17:27:12 +0000 Subject: [PATCH 1/2] mpvScripts.buildLua: don't remove `.lua` from `scriptName` when installing a directory Since 6444a0957bd825e454382d5e7211865afe8ab534, `scriptName` does not include a superfluous `.lua` suffix for directories. --- pkgs/applications/video/mpv/scripts/buildLua.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 4c1e1957c097..9bf99011fc50 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -46,7 +46,7 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy exit 1 } mkdir -p "${scriptsDir}" - cp -a "${scriptPath}" "${scriptsDir}/${lib.removeSuffix ".lua" scriptName}" + cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" else install -m644 -Dt "${scriptsDir}" \ ${escapedList ([ scriptPath ] ++ extraScripts)} From ffd4482a7dd54e66a4d14190c56db61edad3c9a9 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 12 Dec 2023 17:28:44 +0000 Subject: [PATCH 2/2] mpvScripts.simple-mpv-webui: Drop superfluous `.lua` suffix in `scriptName` --- pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index c3b53c618396..b1f3f4595632 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -13,7 +13,7 @@ buildLua rec { }; scriptPath = "."; - passthru.scriptName = "webui.lua"; + passthru.scriptName = "webui"; meta = with lib; { description = "A web based user interface with controls for the mpv mediaplayer";