GNU bug report logs - #36387
[PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.
Date: Tue, 25 Jun 2019 21:53:45 -0400

* gnu/packages/gl.scm (mesa)[arguments]: Add "patch-meson-build" phase.
---
 gnu/packages/gl.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 96e7fc7165..78f7401f20 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -337,6 +337,15 @@ also known as DXTn or DXTC) for Mesa.")
                        (("'u_format_test',") ""))
                      #t)))
                '())
+         (add-after
+           'unpack 'patch-meson-build
+           (lambda _
+             ;; Without this, meson fails with the following error:
+             ;; Dependency "wayland-scanner" not found, tried pkgconfig.
+             (substitute* "meson.build"
+               (("dependency\\('wayland-scanner', native: true\\)")
+                "dependency('wayland-scanner')"))
+             #t))
          (add-before
            'configure 'fix-dlopen-libnames
            (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
2.22.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.