From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:46389) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfx9O-0004bL-3e for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfx9L-0006ax-Eb for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfx9L-0006aH-9Z for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfx9L-0007KV-7L for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:03 -0400 Subject: [bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:45683) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfx8S-0004CR-KP for guix-patches@gnu.org; Tue, 25 Jun 2019 21:54:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfx8R-0005Ca-1r for guix-patches@gnu.org; Tue, 25 Jun 2019 21:54:08 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60288) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfx8Q-0005AU-RC for guix-patches@gnu.org; Tue, 25 Jun 2019 21:54:06 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5A35B16005D for ; Wed, 26 Jun 2019 03:54:04 +0200 (CEST) From: Kei Kebreau Date: Tue, 25 Jun 2019 21:53:45 -0400 Message-Id: <20190626015345.19432-2-kkebreau@posteo.net> In-Reply-To: <20190626015345.19432-1-kkebreau@posteo.net> References: <20190626015345.19432-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36387@debbugs.gnu.org Cc: Kei Kebreau * 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) --=20 2.22.0