From 4390934f0b4a0d9208423e3b261e0f09b40eeb39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Feb 2021 16:37:52 +0100 Subject: gnu: alacritty: Run on Wayland once more. This restores most of commit 3bbe2806bf11f6e95be42b1a21d79bd557f68d0b to fix . * gnu/packages/terminals.scm (alacritty)[arguments]: Patch in absolute references to LIBXKBCOMMON and WAYLAND libraries. --- gnu/packages/terminals.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index c53774b20c..831e10a8e3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1261,7 +1261,42 @@ (define-public alacritty (glutin-version ,(package-version rust-glutin-0.26)) (glutin-api (string-append glutin-name "-" glutin-version ".tar.gz/src/api/")) + (smithay-client-toolkit-name + ,(package-name rust-smithay-client-toolkit-0.12)) + (smithay-client-toolkit-version + ,(package-version rust-smithay-client-toolkit-0.12)) + (smithay-client-toolkit-src + (string-append smithay-client-toolkit-name "-" + smithay-client-toolkit-version ".tar.gz/src")) + (wayland-sys-name ,(package-name rust-wayland-sys-0.28)) + (wayland-sys-version ,(package-version rust-wayland-sys-0.28)) + (wayland-sys-src (string-append wayland-sys-name "-" + wayland-sys-version + ".tar.gz/src")) + (libxkbcommon (assoc-ref inputs "libxkbcommon")) + (libwayland (assoc-ref inputs "wayland")) (mesa (assoc-ref inputs "mesa"))) + (substitute* (string-append vendor-dir "/" + smithay-client-toolkit-src + "/seat/keyboard/ffi.rs") + (("libxkbcommon\\.so") + (string-append libxkbcommon "/lib/libxkbcommon.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/server.rs") + (("libwayland-server\\.so") + (string-append libwayland "/lib/libwayland-server.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/cursor.rs") + (("libwayland-cursor\\.so") + (string-append libwayland "/lib/libwayland-cursor.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/egl.rs") + (("libwayland-egl\\.so") + (string-append libwayland "/lib/libwayland-egl.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/client.rs") + (("libwayland-client\\.so") + (string-append libwayland "/lib/libwayland-client.so"))) (substitute* (string-append vendor-dir "/" glutin-api "glx/mod.rs") (("libGL.so") (string-append mesa "/lib/libGL.so"))) -- cgit v1.2.3