Merge pull request #266495 from nbraud/mpvScripts/lunik1

authored by

Maciej Krüger and committed by
GitHub
d947be88 1cedf179

+10 -30
+2 -2
pkgs/applications/video/mpv/scripts/default.nix
··· 14 14 convert = callPackage ./convert.nix { }; 15 15 inhibit-gnome = callPackage ./inhibit-gnome.nix { }; 16 16 mpris = callPackage ./mpris.nix { }; 17 - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; 17 + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; 18 18 mpv-webm = callPackage ./mpv-webm.nix { }; 19 19 mpvacious = callPackage ./mpvacious.nix { }; 20 - quality-menu = callPackage ./quality-menu.nix { }; 20 + quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; 21 21 simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; 22 22 sponsorblock = callPackage ./sponsorblock.nix { }; 23 23 thumbfast = callPackage ./thumbfast.nix { };
+3 -12
pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
··· 1 - { lib, stdenvNoCC, fetchFromGitHub, yt-dlp }: 1 + { lib, buildLua, fetchFromGitHub, yt-dlp }: 2 2 3 - stdenvNoCC.mkDerivation rec { 3 + buildLua rec { 4 4 pname = "mpv-playlistmanager"; 5 5 version = "unstable-2023-08-09"; 6 6 ··· 17 17 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', 18 18 ''; 19 19 20 - dontBuild = true; 21 - 22 - installPhase = '' 23 - runHook preInstall 24 - install -D -t $out/share/mpv/scripts playlistmanager.lua 25 - runHook postInstall 26 - ''; 27 - 28 - passthru.scriptName = "playlistmanager.lua"; 20 + scriptPath = "playlistmanager.lua"; 29 21 30 22 meta = with lib; { 31 23 description = "Mpv lua script to create and manage playlists"; 32 24 homepage = "https://github.com/jonniek/mpv-playlistmanager"; 33 25 license = licenses.unlicense; 34 - platforms = platforms.all; 35 26 maintainers = with maintainers; [ lunik1 ]; 36 27 }; 37 28 }
+5 -16
pkgs/applications/video/mpv/scripts/quality-menu.nix
··· 1 1 { lib 2 - , stdenvNoCC 2 + , buildLua 3 3 , fetchFromGitHub 4 4 , oscSupport ? false 5 5 }: 6 6 7 - stdenvNoCC.mkDerivation rec { 7 + buildLua rec { 8 8 pname = "mpv-quality-menu"; 9 - version = "4.1.0"; 9 + version = "4.1.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "christoph-heinrich"; 13 13 repo = "mpv-quality-menu"; 14 14 rev = "v${version}"; 15 - hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc="; 15 + hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; 16 16 }; 17 17 18 - dontBuild = true; 19 - 20 - installPhase = '' 21 - runHook preInstall 22 - mkdir -p $out/share/mpv/scripts 23 - cp quality-menu.lua $out/share/mpv/scripts 24 - '' + lib.optionalString oscSupport '' 25 - cp quality-menu-osc.lua $out/share/mpv/scripts 26 - '' + '' 27 - runHook postInstall 28 - ''; 29 - 30 18 passthru.scriptName = "quality-menu.lua"; 19 + scriptPath = if oscSupport then "*.lua" else passthru.scriptName; 31 20 32 21 meta = with lib; { 33 22 description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";