diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix index d93e4cb5bdd6..7d709571efb3 100644 --- a/pkgs/by-name/mp/mpv/package.nix +++ b/pkgs/by-name/mp/mpv/package.nix @@ -121,6 +121,8 @@ symlinkJoin { (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: diff --git a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix index 1e7e4b731c39..362031f19db3 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix @@ -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}";