From 38a020ed8e5d6715bacf7c28dcfb8fd43bac6a46 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 22 Jul 2025 17:53:38 +0900 Subject: [PATCH] gnu: glad: Update to 2.0.8 and run tests. * gnu/packages/gl.scm (glad): Update to 2.0.8. [build-system]: Switch to pyproject-build-system. [#:phases] {check}: New phase override. [native-inputs]: Add python-setuptools, python-wheel and xvfb-run. Change-Id: I20594a2bc880e080c089a7b9ae1a07cd332b5dce --- gnu/packages/gl.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f05e870335..865e0ab161 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rust) #:use-module (gnu packages tls) @@ -74,6 +75,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) @@ -238,7 +240,7 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (package (inherit glad-0.1) (name "glad") - (version "2.0.4") + (version "2.0.8") (source (origin (method git-fetch) (uri (git-reference @@ -247,8 +249,8 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (file-name (git-file-name name version)) (sha256 (base32 - "1pam6imhcmcyqrqi6wzzxprb23y8x6zdbvsjavnz26k72i9dbbja")))) - (build-system python-build-system) + "0c9cygiq35aiq6bpdvbwqs0wxc2dvxsh4jnx50466savscxalsk9")))) + (build-system pyproject-build-system) (arguments (substitute-keyword-arguments (package-arguments glad-0.1) ((#:phases phases '%standard-phases) @@ -257,7 +259,12 @@ generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (lambda _ (let ((share (string-append #$output "/share/" #$(package-name this-package)))) - (install-file "cmake/CMakeLists.txt" share)))))))) + (install-file "cmake/CMakeLists.txt" 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)) (propagated-inputs (list python-jinja2)))) (define-public s2tc