bug#64981: GTK4 applications broken (missing libGLESv2)

[John Kehayias via Bug reports for GNU Guix <bug-guix@gnu.org>]

Hi everyone,

Not sure if people saw this patch, has anyone tested if it fixes the
problem for them? I can include it in an upcoming mesa-updates branch
with other related updates/rebuilds.

<https://issues.guix.gnu.org/65375>

Hope I got everyone from the original bug thread (seems many replies
didn't go directly to everyone) and cc'ed the patch number as well.

Thanks!
John

On Sat, Aug 19, 2023 at 10:59 AM, iyzsong@envs.net wrote:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> Fixes <https://issues.guix.gnu.org/64981>.
>
> * gnu/packages/gl.scm (libepoxy)[arguments]<#:phases>:
> Hardcode paths to libGLESv1_CM.so.1 and libGLESv2.so.2.
> ---
>  gnu/packages/gl.scm | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
> index b53b42a9ba..f662f0f7da 100644
> --- a/gnu/packages/gl.scm
> +++ b/gnu/packages/gl.scm
> @@ -742,10 +742,14 @@ (define-public libepoxy
>        #~(modify-phases %standard-phases
>            (add-before 'configure 'patch-paths
>              (lambda* (#:key inputs #:allow-other-keys)
> -              (let ((mesa (dirname (search-input-file inputs "lib/libGL.so"))))
> +              (let ((mesa-lib
> +                     (lambda (file)
> +                       (search-input-file inputs (string-append "lib/" file)))))
>                  (substitute* (find-files "." "\\.[ch]$")
> -                  (("libGL.so.1") (string-append mesa "/libGL.so.1"))
> -                  (("libEGL.so.1") (string-append mesa "/libEGL.so.1")))))))))
> +                  (("libGL.so.1") (mesa-lib "libGL.so.1"))
> +                  (("libEGL.so.1") (mesa-lib "libEGL.so.1"))
> +                  (("libGLESv1_CM.so.1") (mesa-lib "libGLESv1_CM.so.1"))
> +                  (("libGLESv2.so.2") (mesa-lib "libGLESv2.so.2")))))))))
>      (build-system meson-build-system)
>      (native-inputs
>       (list pkg-config python))
>
> base-commit: 597af70fd24eb85a85fa8c45008c9cfa241f4d0b