summaryrefslogtreecommitdiff
path: root/gnu/packages/terminals.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-02-16 16:37:52 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-02-16 16:39:22 +0100
commit4390934f0b4a0d9208423e3b261e0f09b40eeb39 (patch)
treead5e4af2081a634ae3e9d48e58e9b451697c387d /gnu/packages/terminals.scm
parenta6f8e8200f2a3885cda41520b9f8d2e2a1350cbe (diff)
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.
Diffstat (limited to 'gnu/packages/terminals.scm')
-rw-r--r--gnu/packages/terminals.scm35
1 files changed, 35 insertions, 0 deletions
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 @@ 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")))