branch master updated: gnu: alacritty: Run on Wayland once more.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4390934  gnu: alacritty: Run on Wayland once more.
4390934 is described below

commit 4390934f0b4a0d9208423e3b261e0f09b40eeb39
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Feb 16 16:37:52 2021 +0100

    gnu: alacritty: Run on Wayland once more.
    
    This restores most of commit 3bbe2806bf11f6e95be42b1a21d79bd557f68d0b
    to fix <http://logs.guix.gnu.org/guix/2021-02-16.log#150007>.
    
    * 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(+)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index c53774b..831e10a 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1261,7 +1261,42 @@ made by suckless.")
                     (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")))