guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-conf


From: Kei Kebreau
Subject: [bug#36387] [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






reply via email to

[Prev in Thread] Current Thread [Next in Thread]