diff options
| author | Andreas Enge <andreas@enge.fr> | 2026-03-15 14:56:18 +0100 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2026-03-30 10:36:23 +0300 |
| commit | d9d725c9914bdcd0d4d3f1fc45dd204c39ae013d (patch) | |
| tree | b7cb0c7fd4d13f394e8a21ab8725d074cb694674 | |
| parent | 7ec8a42a2fec78bfb6e5f27369b189ee3bbb741d (diff) | |
gnu: glad: Disinherit from glad-0.1 and enable tests.
* gnu/packages/gl.scm (glad)[inherit]: Remove field.
[home-page, synopsis, description, license]: Copy fields from glad-0.1.
[arguments]<#:tests>: Do not copy from glad-0.1.
<#:phases>: Rewrite from scratch.
Change-Id: I1404b087d1b39bbfab4e695682a301c2ea8ae7f8
Signed-off-by: John Kehayias <john@guixotic.coop>
| -rw-r--r-- | gnu/packages/gl.scm | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f90c5a8865b..0664510ec85 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -244,7 +244,6 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (define-public glad (package - (inherit glad-0.1) (name "glad") (version "2.0.8") (source (origin @@ -258,21 +257,26 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") "0c9cygiq35aiq6bpdvbwqs0wxc2dvxsh4jnx50466savscxalsk9")))) (build-system pyproject-build-system) (arguments - (substitute-keyword-arguments (package-arguments glad-0.1) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - (replace 'install-cmakelists.txt - (lambda _ - (let ((share (string-append #$output "/share/" - #$(package-name this-package)))) - (install-file "cmake/CMakeLists.txt" share) - (install-file "cmake/GladConfig.cmake" share)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "xvfb-run" "utility/test.sh")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-cmakelists.txt + (lambda _ + (let ((share (string-append #$output "/share/" + #$(package-name this-package)))) + (install-file "cmake/CMakeLists.txt" share) + (install-file "cmake/GladConfig.cmake" share)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "xvfb-run" "utility/test.sh"))))))) (native-inputs (list python-setuptools python-wheel xvfb-run-for-tests)) - (propagated-inputs (list python-jinja2)))) + (propagated-inputs (list python-jinja2)) + (home-page "https://github.com/Dav1dde/glad") + (synopsis "Multi-language GL/GLES/EGL/GLX/WGL loader generator") + (description "Glad uses the official Khronos XML specifications to +generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") + (license license:expat))) (define-public s2tc (package |