sharlatan pushed a commit to branch master
in repository guix.

commit e4248af6061fc12843beaa9616c00b98700b44e0
Author: Sisiutl <[email protected]>
AuthorDate: Mon Feb 3 13:47:22 2025 +0100

    gnu: python-pyopengl: Add support for additional GL platforms.
    
    * gnu/packages/python-xyz.scm (python-pyopengl)[arguments]:
    Fix paths for non-GLX platforms too.
    
    Change-Id: Ib50d5c64ff73079c4ffa3bd3e03012a66591ddfc
    Signed-off-by: Sharlatan Hellseher <[email protected]>
---
 gnu/packages/python-xyz.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8dfa34e1d8..d95a4e0937 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27332,18 +27332,18 @@ functionality like full case-folding for 
case-insensitive matches in Unicode.")
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* '("OpenGL/platform/ctypesloader.py")
                (("filenames_to_try = \\[\\]") "filenames_to_try = [name]"))
-             (substitute* '("OpenGL/platform/glx.py" 
"tests/check_glut_load.py")
-               (("'GL'")
-                (string-append "'" (assoc-ref inputs "mesa") "/lib/libGL.so'"))
+             (substitute* '("OpenGL/platform/glx.py"
+                            "OpenGL/platform/egl.py"
+                            "OpenGL/platform/osmesa.py"
+                            "OpenGL/platform/darwin.py"
+                            "tests/check_glut_load.py")
                (("'GLU'")
                 (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'"))
                (("'glut',")
                 (string-append "'" (assoc-ref inputs "freeglut") 
"/lib/libglut.so',"))
-               (("'GLESv1_CM'")
-                (string-append "'" (assoc-ref inputs "mesa") 
"/lib/libGLESv1_CM.so'"))
-               (("'GLESv2'")
-                (string-append "'" (assoc-ref inputs "mesa") 
"/lib/libGLESv2.so'")))
-               ;; Not providing libgle. It seems to be very old.
+               (("'(GL|EGL|GLESv1_CM|GLESv2|OSMesa)'" all gl-library)
+                (string-append "'" (assoc-ref inputs "mesa") (string-append 
"/lib/lib" gl-library ".so'"))))
+             ;; Not providing libgle. It seems to be very old.
              #t)))))
     (home-page "https://pyopengl.sourceforge.net";)
     (synopsis "Standard OpenGL bindings for Python")

Reply via email to