From 30b9cd6f1a69921e59e71df1214604be62636284 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 17 Feb 2025 10:28:26 +0100 Subject: [PATCH] mpv: drop old wrapMpv compatibility (#6024) wrapMpv doesn't exist anymore for a while. --- modules/programs/mpv.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/programs/mpv.nix b/modules/programs/mpv.nix index e8bcc144..b6220876 100644 --- a/modules/programs/mpv.nix +++ b/modules/programs/mpv.nix @@ -55,10 +55,8 @@ let mpvPackage = if cfg.scripts == [ ] then cfg.package - else if hasAttr "wrapMpv" pkgs then - pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = cfg.scripts; } else - pkgs.mpv.override { scripts = cfg.scripts; }; + pkgs.mpv.override { inherit (cfg) scripts; }; in { options = { @@ -69,7 +67,7 @@ in { type = types.package; default = pkgs.mpv; example = literalExpression - "pkgs.wrapMpv (pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }) { youtubeSupport = true; }"; + "pkgs.mpv-unwrapped.wrapper { mpv = pkgs.mpv-unwrapped.override { vapoursynthSupport = true; }; youtubeSupport = true; }"; description = '' Package providing mpv. '';