mpv.tests.mpv-scripts-should-not-collide: unbreak (#541816)

This commit is contained in:
Colin
2026-07-14 18:02:42 +00:00
committed by GitHub
3 changed files with 12 additions and 0 deletions
+4
View File
@@ -117,8 +117,12 @@ symlinkJoin {
passthru.tests.mpv-scripts-should-not-collide = buildEnv {
name = "mpv-scripts-env";
paths = lib.pipe mpvScripts [
# filters "throw" aliases
(lib.filterAttrs (key: script: (builtins.tryEval (lib.isDerivation script)).success))
# filters "override" "overrideDerivation" "recurseForDerivations"
(lib.filterAttrs (key: script: lib.isDerivation script))
# filters mpv scripts that opt out of this check
(lib.filterAttrs (key: script: !(script.passthru.dontCollideCheck or false)))
# replaces unfree and meta.broken scripts with decent placeholders
(lib.mapAttrsToList (
key: script:
@@ -4,6 +4,7 @@
fetchFromGitHub,
installFonts,
makeFontsConf,
mpvScripts,
nix-update-script,
}:
buildLua (finalAttrs: {
@@ -30,6 +31,9 @@ buildLua (finalAttrs: {
passthru.updateScript = nix-update-script { };
# FIXME?: collides with mpvScripts.modernx
passthru.dontCollideCheck = lib.hasAttr "modernx" mpvScripts;
meta = {
description = "Modern OSC UI replacement for MPV that retains the functionality of the default OSC";
changelog = "https://github.com/zydezu/ModernX/releases/tag/${finalAttrs.version}";
@@ -2,6 +2,7 @@
lib,
buildLua,
fetchFromGitHub,
mpvScripts,
}:
buildLua (finalAttrs: {
pname = "mpv-osc-tethys";
@@ -11,6 +12,9 @@ buildLua (finalAttrs: {
extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ];
extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ];
# FIXME?: collides with mpvScripts.thumbnail, this one yields since it is unfree
passthru.dontCollideCheck = lib.hasAttr "thumbnail" mpvScripts;
src = fetchFromGitHub {
owner = "Zren";
repo = "mpv-osc-tethys";