Merge pull request #119968 from lunik1/mpv-plugins-cleanup

mpvScripts: use stdenvNoCC and misc. cleanup
This commit is contained in:
Jörg Thalheim 2021-04-21 08:12:06 +01:00 committed by GitHub
commit 3bba0abca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 14 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, mpv-unwrapped, lib }: { stdenvNoCC, mpv-unwrapped, lib }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mpv-autoload"; pname = "mpv-autoload";
version = mpv-unwrapped.version; version = mpv-unwrapped.version;
src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua"; src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua";

View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, lib { stdenvNoCC, fetchgit, lib
, yad, mkvtoolnix-cli, libnotify }: , yad, mkvtoolnix-cli, libnotify }:
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
pname = "mpv-convert-script"; pname = "mpv-convert-script";
version = "2016-03-18"; version = "2016-03-18";
src = fetchgit { src = fetchgit {
@ -30,14 +30,17 @@ stdenv.mkDerivation {
''; '';
passthru.scriptName = "convert_script.lua"; passthru.scriptName = "convert_script.lua";
meta = { meta = with lib; {
description = "Convert parts of a video while you are watching it in mpv"; description = "Convert parts of a video while you are watching it in mpv";
homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0";
maintainers = [ lib.maintainers.Profpatsch ]; maintainers = [ maintainers.Profpatsch ];
longDescription = '' longDescription = ''
When this script is loaded into mpv, you can hit Alt+W to mark the beginning When this script is loaded into mpv, you can hit Alt+W to mark the beginning
and Alt+W again to mark the end of the clip. Then a settings window opens. and Alt+W again to mark the end of the clip. Then a settings window opens.
''; '';
license = licenses.unfree;
# script crashes mpv. See https://github.com/NixOS/nixpkgs/issues/113202
broken = true;
}; };
} }

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, curl, xclip }: { lib, stdenvNoCC, fetchFromGitHub, curl, xclip }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mpvacious"; pname = "mpvacious";
version = "0.14"; version = "0.14";

View File

@ -1,6 +1,6 @@
{ lib, stdenv { lib, stdenvNoCC
, fetchFromGitHub }: , fetchFromGitHub }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "simple-mpv-ui"; pname = "simple-mpv-ui";
version = "1.0.0"; version = "1.0.0";

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: { lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3 }:
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }`
stdenv.mkDerivation { stdenvNoCC.mkDerivation {
pname = "mpv_sponsorblock"; pname = "mpv_sponsorblock";
version = "unstable-2020-07-05"; version = "unstable-2020-07-05";

View File

@ -1,6 +1,6 @@
{ fetchFromGitHub, lib, python3, stdenv }: { fetchFromGitHub, lib, python3, stdenvNoCC }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mpv_thumbnail_script"; pname = "mpv_thumbnail_script";
version = "unstable-2020-01-16"; version = "unstable-2020-01-16";