~ruther/guix-local: gnu: igt-gpu-tools: Fix build with newer Mesons.

cf879dc0b6fcbf9c49515209f8c0d92cebc98d84 — Tobias Geerinckx-Rice 4 years ago a0fd9a35

gnu: igt-gpu-tools: Fix build with newer Mesons.

* gnu/packages/admin.scm (igt-gpu-tools)[arguments]:
Add a new 'fix-meson.build phase.

patch browse .tar.gz .zip

1 files changed, 10 insertions(+), 1 deletions(-)

M gnu/packages/admin.scm

M gnu/packages/admin.scm => gnu/packages/admin.scm +10 -1

@@ 3534,6 3534,7 @@ buffers.")
 (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 @@ buffers.")
         (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