From b41e56b7513872bec52606304b76d81ac26be4a6 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 20 Apr 2021 18:38:09 +0100 Subject: [PATCH 1/4] mpvScripts: use stdenvNoCC mpv lua scripts do not require a C compiler --- pkgs/applications/video/mpv/scripts/autoload.nix | 4 ++-- pkgs/applications/video/mpv/scripts/convert.nix | 4 ++-- pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++-- pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix | 4 ++-- pkgs/applications/video/mpv/scripts/sponsorblock.nix | 4 ++-- pkgs/applications/video/mpv/scripts/thumbnail.nix | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/autoload.nix b/pkgs/applications/video/mpv/scripts/autoload.nix index f64e702f21c..1840040d836 100644 --- a/pkgs/applications/video/mpv/scripts/autoload.nix +++ b/pkgs/applications/video/mpv/scripts/autoload.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, mpv-unwrapped, lib }: +{ stdenvNoCC, fetchurl, mpv-unwrapped, lib }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mpv-autoload"; version = mpv-unwrapped.version; src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua"; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index ce069520332..935740db276 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, lib +{ stdenvNoCC, fetchgit, lib , yad, mkvtoolnix-cli, libnotify }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "mpv-convert-script"; version = "2016-03-18"; src = fetchgit { diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 0995d976e60..3225317d78b 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, curl, xclip }: +{ lib, stdenvNoCC, fetchFromGitHub, curl, xclip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mpvacious"; version = "0.14"; diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index 0c0597d3afb..99b731757ff 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "simple-mpv-ui"; version = "1.0.0"; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 79ede806b0c..5d33bfd92a4 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3 }: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; version = "unstable-2020-07-05"; diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix index cda15b2674c..4bee220f4c9 100644 --- a/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, lib, python3, stdenv }: +{ fetchFromGitHub, lib, python3, stdenvNoCC }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mpv_thumbnail_script"; version = "unstable-2020-01-16"; From 9485531db962409f5053cc53c8c6731f2dc0d93a Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 20 Apr 2021 18:54:41 +0100 Subject: [PATCH 2/4] mpvScripts.autoload: remove unused dependency on fetchurl --- pkgs/applications/video/mpv/scripts/autoload.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/scripts/autoload.nix b/pkgs/applications/video/mpv/scripts/autoload.nix index 1840040d836..8f09070c5f4 100644 --- a/pkgs/applications/video/mpv/scripts/autoload.nix +++ b/pkgs/applications/video/mpv/scripts/autoload.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, mpv-unwrapped, lib }: +{ stdenvNoCC, mpv-unwrapped, lib }: stdenvNoCC.mkDerivation rec { pname = "mpv-autoload"; From eee5a743812fb824c517a3ec0efd62dc9ccfb288 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 20 Apr 2021 18:58:09 +0100 Subject: [PATCH 3/4] mpvScripts.convert: set license to unfree The upstream gist has no license, to the license should be unfree as per CONTRIBUTING.md --- pkgs/applications/video/mpv/scripts/convert.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 935740db276..b7d6ea88fe1 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -30,14 +30,15 @@ stdenvNoCC.mkDerivation { ''; passthru.scriptName = "convert_script.lua"; - meta = { + meta = with lib; { description = "Convert parts of a video while you are watching it in mpv"; homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; longDescription = '' 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. ''; + license = licenses.unfree; }; } From ab7032446922199e05b07b6adb4c32b0e191be33 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Tue, 20 Apr 2021 19:46:36 +0100 Subject: [PATCH 4/4] mpvScritps.convert: mark as broken See: #113202 --- pkgs/applications/video/mpv/scripts/convert.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index b7d6ea88fe1..2ff335b083a 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -39,6 +39,8 @@ stdenvNoCC.mkDerivation { 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; }; }