me
/
guix
Archived
1
0
Fork 0
Code

gnu: alacritty: Run on Wayland once more. 

This restores most of commit 3bbe2806bf
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.
master
Tobias Geerinckx-Rice 2021-02-16 16:37:52 +01:00
parent a6f8e8200f
commit 4390934f0b
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/terminals.scm
View File

@ -1261,7 +1261,42 @@ made by suckless.")
(glutin-version ,(package-version rust-glutin-0.26)) (glutin-version ,(package-version rust-glutin-0.26))
(glutin-api (string-append glutin-name "-" glutin-version (glutin-api (string-append glutin-name "-" glutin-version
".tar.gz/src/api/")) ".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"))) (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* (substitute*
(string-append vendor-dir "/" glutin-api "glx/mod.rs") (string-append vendor-dir "/" glutin-api "glx/mod.rs")
(("libGL.so") (string-append mesa "/lib/libGL.so"))) (("libGL.so") (string-append mesa "/lib/libGL.so")))