all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: iyzsong--- via Guix-patches via <guix-patches@gnu.org>
To: 65375@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>, 64981@debbugs.gnu.org
Subject: [bug#65375] [PATCH] gnu: libepoxy: Hardcode paths to GLES libraries.
Date: Sat, 19 Aug 2023 10:59:34 +0800	[thread overview]
Message-ID: <4d6f572f6f936a57f80f0447ef8b7ce0ec06b663.1692413930.git.iyzsong@member.fsf.org> (raw)

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
-- 
2.41.0





         reply	other threads:[~2023-08-19  3:00 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-31 22:06 bug#64981: GTK4 applications broken (missing libGLESv2) Csepp
2023-08-05 12:01 ` Liliana Marie Prikler
2023-08-06 10:10   ` Csepp
2023-08-06 15:15     ` paren--- via Bug reports for GNU Guix
2023-08-10 20:47 ` Denis 'GNUtoo' Carikli
2023-08-15 20:46 ` Efraim Flashner
2023-08-16 13:51 ` jbranso--- via Bug reports for GNU Guix
2023-08-19  2:59 ` iyzsong--- via Guix-patches via [this message]
2023-08-19  3:13   ` 宋文武 via Bug reports for GNU Guix
2023-10-06 15:47 ` John Kehayias via Bug reports for GNU Guix
2023-11-28  5:33   ` John Kehayias via Bug reports for GNU Guix

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=4d6f572f6f936a57f80f0447ef8b7ce0ec06b663.1692413930.git.iyzsong@member.fsf.org \
    --to=guix-patches@gnu.org \
    --cc=64981@debbugs.gnu.org \
    --cc=65375@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=iyzsong@member.fsf.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.