Unverified Commit 16369e34 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

mpv: update wrapper to support multiple `--script` args (#461114)

parents 1f6ae0e4 e4bb2901

pkgs/applications/video/mpv/scripts/buildLua.nix

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ lib.makeOverridable ( 
    extendedBy (if lib.isFunction args then args else (_: args)) (

      {

        pname,

        extraScripts ? [ ],

        extraScriptsToCopy ? [ ],

        runtime-dependencies ? [ ],

        ...

      }@args:
@@ -59,8 +59,8 @@ lib.makeOverridable ( 
              echo "Script directory '${scriptPath}' does not contain 'main.lua'" >&2

              exit 1

            }

            [ ${with builtins; toString (length extraScripts)} -eq 0 ] || {

              echo "mpvScripts.buildLua does not support 'extraScripts'" \

            [ ${with builtins; toString (length extraScriptsToCopy)} -eq 0 ] || {

              echo "mpvScripts.buildLua does not support 'extraScriptsToCopy'" \

                   "when 'scriptPath' is a directory" >&2

              exit 1

            }
@@ -69,8 +69,8 @@ lib.makeOverridable ( 
          else

            install -m644 -Dt "${scriptsDir}" ${escaped scriptPath}

            ${lib.optionalString (

              extraScripts != [ ]

            ) ''cp -at "${scriptsDir}/" ${escapedList extraScripts}''}

              extraScriptsToCopy != [ ]

            ) ''cp -at "${scriptsDir}/" ${escapedList extraScriptsToCopy}''}

          fi



          runHook postInstall

pkgs/applications/video/mpv/scripts/cutter.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ buildLua { 
  '';



  passthru.scriptName = "cutter.lua";

  extraScripts = [ "c_concat.sh" ];

  extraScriptsToCopy = [ "c_concat.sh" ];



  postInstall = ''

    wrapProgram $out/share/mpv/scripts/c_concat.sh \

pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ buildLua (finalAttrs: { 
  version = "0-unstable-2024-08-19";



  scriptPath = "osc_tethys.lua";

  extraScripts = [ "mpv_thumbnail_script_server.lua" ];

  extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ];

  extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ];



  src = fetchFromGitHub {

    owner = "Zren";

pkgs/applications/video/mpv/scripts/quality-menu.nix

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ buildLua rec { 
  };

  passthru.updateScript = gitUpdater { rev-prefix = "v"; };



  extraScripts = lib.optional oscSupport "quality-menu-osc.lua";

  extraScriptsToCopy = lib.optional oscSupport "quality-menu-osc.lua";

  extraScriptsToLoad = lib.optional oscSupport "quality-menu-osc.lua";



  meta = with lib; {

    description = "Userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";

pkgs/applications/video/mpv/scripts/sponsorblock.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ buildLua { 
      --replace-fail 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\""

  '';



  extraScripts = [ "sponsorblock_shared" ];

  extraScriptsToCopy = [ "sponsorblock_shared" ];



  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };