From 8d2bb2ab1a07be795ae9fd5a501780181f98b25c Mon Sep 17 00:00:00 2001 From: XYenon Date: Sat, 29 Mar 2025 19:58:18 +0800 Subject: [PATCH 1/2] python3Packages.mpv: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/mpv/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index 9f92995dd8bb..e6460bec7a88 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -3,34 +3,35 @@ stdenv, buildPythonPackage, fetchFromGitHub, + pythonOlder, mpv, setuptools, }: buildPythonPackage rec { pname = "mpv"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - hash = "sha256-1axVJ8XXs0ZPgsVux3+6YUm1KttLceZyyHOuUEHIFl4="; + hash = "sha256-2sYWTzj7+ozezNX0uFdJW+A0K6bwAmiVvqo/lr9UToA="; }; + disabled = pythonOlder "3.9"; + nativeBuildInputs = [ setuptools ]; buildInputs = [ mpv ]; postPatch = '' substituteInPlace mpv.py \ - --replace "sofile = ctypes.util.find_library('mpv')" \ - 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' + --replace-fail "sofile = ctypes.util.find_library('mpv')" \ + 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; - # tests impure, will error if it can't load libmpv.so - doCheck = false; pythonImportsCheck = [ "mpv" ]; meta = with lib; { From ddc6481cf5493b0bbda580185231949318d4ec0b Mon Sep 17 00:00:00 2001 From: XYenon Date: Sat, 29 Mar 2025 20:39:40 +0800 Subject: [PATCH 2/2] python3Packages.mpv: fix keybinds not working --- pkgs/development/python-modules/mpv/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index e6460bec7a88..716a51f00d86 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, mpv, setuptools, @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-2sYWTzj7+ozezNX0uFdJW+A0K6bwAmiVvqo/lr9UToA="; }; + patches = [ + # https://github.com/jellyfin/jellyfin-mpv-shim/issues/448 + (fetchpatch { + url = "https://github.com/jaseg/python-mpv/commit/12850b34bd3b64704f8abd30341a647a73719267.patch"; + hash = "sha256-2O7w8PeWinCzrigGX3IV+9PVCtU9KCM2UJ32Y1kE6m0="; + }) + ]; + disabled = pythonOlder "3.9"; nativeBuildInputs = [ setuptools ];