[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/12: gnu: libepoxy: Hardcode paths to GLES libraries.
From: |
guix-commits |
Subject: |
10/12: gnu: libepoxy: Hardcode paths to GLES libraries. |
Date: |
Sun, 5 Nov 2023 23:11:32 -0500 (EST) |
podiki pushed a commit to branch mesa-updates
in repository guix.
commit 37fc2c99e0067dfd669526c61dc10d014b89c08b
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Sat Aug 19 10:59:34 2023 +0800
gnu: libepoxy: Hardcode paths to GLES libraries.
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.
Signed-off-by: John Kehayias <john.kehayias@protonmail.com>
Change-Id: I9d68a2b8f9c4ffee13ea63ea973970bf1d4c8a6d
---
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 8cd4f746ec..c02a6f0a84 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -754,10 +754,14 @@ OpenGL graphics API.")
#~(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))
- branch mesa-updates created (now 97f292b47f), guix-commits, 2023/11/05
- 06/12: gnu: nghttp2: Update to 1.58.0 and ungraft., guix-commits, 2023/11/05
- 07/12: gnu: curl: Ungraft., guix-commits, 2023/11/05
- 09/12: gnu: mesa: Update to 23.2.1., guix-commits, 2023/11/05
- 02/12: gnu: libxpm: Ungraft., guix-commits, 2023/11/05
- 10/12: gnu: libepoxy: Hardcode paths to GLES libraries.,
guix-commits <=
- 05/12: gnu: libxkbcommon: Update to 1.6.0., guix-commits, 2023/11/05
- 12/12: gnu: sdl2: Update to 2.28.5., guix-commits, 2023/11/05
- 11/12: gnu: sdl2: Add vulkan-loader to rpath., guix-commits, 2023/11/05
- 08/12: gnu: curl: Run tests in parallel., guix-commits, 2023/11/05
- 04/12: gnu: libdrm: Update to 2.4.117., guix-commits, 2023/11/05
- 03/12: gnu: pixman: Update to 0.42.2., guix-commits, 2023/11/05
- 01/12: gnu: libx11: Ungraft., guix-commits, 2023/11/05