libglvnd just dropped in deps

1 files changed, 32 insertions, 3 deletions

diff --git a/sigils/packages/upstream.scm b/sigils/packages/upstream.scm
index 43d3f3d..cd7401e 100644
--- a/sigils/packages/upstream.scm
+++ b/sigils/packages/upstream.scm
@@ -33,6 +33,9 @@
   #:use-module (gnu packages glib)
   ;; pyopengl
   #:use-module (gnu packages gl)
+  #:use-module ((gnu packages python-xyz)
+                #:hide (python-pyopengl
+                        python-pyopengl-accelerate))
   ;; udis86
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -286,12 +289,14 @@ instruction set architectures.")
                             "OpenGL/platform/osmesa.py"
                             "OpenGL/platform/darwin.py"
                             "tests/check_glut_load.py")
+               (("'OpenGL'")
+                (format #f "'~a/lib/libOpenGL.so'" (assoc-ref inputs "libglvnd")))
                (("'GLU'")
-                (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'"))
+                (format #f "'~a/lib/libGLU.so'" (assoc-ref inputs "glu")))
                (("'glut',")
-                (string-append "'" (assoc-ref inputs "freeglut") "/lib/libglut.so',"))
+                (format #f "'~a/lib/libglut.so'," (assoc-ref inputs "freeglut")))
                (("'(GL|EGL|GLESv1_CM|GLESv2|OSMesa)'" all gl-library)
-                (string-append "'" (assoc-ref inputs "mesa") (string-append "/lib/lib" gl-library ".so'"))))
+                (format #f "'~a/lib/lib~a.so'" (assoc-ref inputs "mesa") gl-library)))
                ;; Not providing libgle. It seems to be very old.
              #t)))))
     (home-page "https://pyopengl.sourceforge.net")
@@ -301,3 +306,27 @@ instruction set architectures.")
 related APIs.  The binding is created using the standard @code{ctypes}
 library.")
     (license license:bsd-3)))
+
+(define-public python-pyopengl-accelerate
+  (package
+    (inherit python-pyopengl)
+    (name "python-pyopengl-accelerate")
+    (version "3.1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "PyOpenGL-accelerate" version))
+       (sha256
+        (base32
+         "1hydrpdn4p4z6mlczcg1y4s0z8si3rs6zq8x4ql558pcaq1312md"))))
+    (inputs
+     (list libglvnd mesa python-numpy)) ; for cython module
+                                        ; numpy_formathandler, thus not propagated
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'fix-paths))))
+    (synopsis "Acceleration code for PyOpenGL")
+    (description
+     "This is the Cython-coded accelerator module for PyOpenGL.")))