From c7bed7d1897edaa1963c040796271afaacde6a51 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 1 Dec 2025 22:36:12 +0000
Subject: [PATCH] gnu: python-mpv: Improve package.

Dependency on python-xvfbwrapper was review by upstream in 2023, see:
<https://github.com/jaseg/python-mpv/issues/249>.

* gnu/packages/python-xyz.scm (python-mpv):
[arguments]: Use THIS-PACKAGE-INPUT and FORMAT to simplify "libmpv"
substitution.
[native-inputs]: Remove python-xvfbwrapper and python-wheel; add
xorg-server-for-tests.

Change-Id: I5856d4a5cb68a442b34ef4518361ab5aec8b7a50
---
 gnu/packages/python-xyz.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c0a0d50a98d..2a4273fbd77 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -35547,11 +35547,10 @@ utility.  It also provides two command-line tools, @code{bsdiff4} and
     (version "1.0.8")
     (source
      (origin
-       ;; python-mpv from pypi does not include the tests directory.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jaseg/python-mpv")
-             (commit (string-append "v" version))))
+              (url "https://github.com/jaseg/python-mpv")
+              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32 "04azy5wa2n8pa21z6lz1p1p0vy7flaqm8ypy46jb77gig2g50xrh"))))
@@ -35564,9 +35563,8 @@ utility.  It also provides two command-line tools, @code{bsdiff4} and
                    ;; Without an absolute path it is not able find and load libmpv.
                    (substitute* "mpv.py"
                      (("sofile = .*")
-                      (string-append "sofile = \""
-                                     (search-input-file inputs "/lib/libmpv.so")
-                                     "\"\n")))))
+                      (format #f "sofile = '~a/lib/libmpv.so'~%"
+                              #$(this-package-input "mpv"))))))
                (add-before 'check 'prepare-for-tests
                  (lambda _
                    ;; Fontconfig throws errors when it has no cache dir to use.
@@ -35579,8 +35577,7 @@ utility.  It also provides two command-line tools, @code{bsdiff4} and
      (list python-pytest
            python-pyvirtualdisplay
            python-setuptools
-           python-xvfbwrapper
-           python-wheel))
+           xorg-server-for-tests))
     (inputs (list mpv))
     (propagated-inputs (list python-pillow)) ;for raw screenshots
     (home-page "https://github.com/jaseg/python-mpv")