From cf879dc0b6fcbf9c49515209f8c0d92cebc98d84 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Dec 2021 02:15:33 +0100 Subject: gnu: igt-gpu-tools: Fix build with newer Mesons. * gnu/packages/admin.scm (igt-gpu-tools)[arguments]: Add a new 'fix-meson.build phase. --- gnu/packages/admin.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index de2f67f238..63d0760a2d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3534,6 +3534,7 @@ (define-public sedsed (define-public igt-gpu-tools (package (name "igt-gpu-tools") + ;; You should very likely remove the 'fix-meson.build phase when upgrading. (version "1.26") (source (origin @@ -3546,7 +3547,15 @@ (define-public igt-gpu-tools (base32 "0m124pqv7zna25jnvk566c4kk628jr0w8mgnp8mr5xqz9cprgczm")))) (build-system meson-build-system) (arguments - `(#:tests? #f)) ; many of the tests try to load kernel modules + `(#:tests? #f ; many of the tests try to load kernel modules + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-meson.build + ;; Fix ‘ERROR: Function does not take positional arguments.’ + (lambda _ + (substitute* "lib/meson.build" + (("f\\.underscorify\\(f\\)") + "f.underscorify()"))))))) (inputs (list cairo elfutils ; libdw -- cgit v1.2.3