all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kei Kebreau <kkebreau@posteo.net>
To: 36387@debbugs.gnu.org
Cc: Kei Kebreau <kkebreau@posteo.net>
Subject: [bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.
Date: Tue, 25 Jun 2019 21:53:45 -0400	[thread overview]
Message-ID: <20190626015345.19432-2-kkebreau@posteo.net> (raw)
In-Reply-To: <20190626015345.19432-1-kkebreau@posteo.net>

* 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	other threads:[~2019-06-26  1:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-26  1:53 [bug#36386] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file Kei Kebreau
2019-06-26  1:53 ` Kei Kebreau [this message]
2021-11-14  1:22   ` [bug#36387] " Maxim Cournoyer
2021-12-27 13:46     ` Kei Kebreau
2021-12-28  2:34       ` bug#36387: " Maxim Cournoyer
2019-06-30 15:10 ` bug#36386: " Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190626015345.19432-2-kkebreau@posteo.net \
    --to=kkebreau@posteo.net \
    --cc=36387@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.