me/guix
Archived
1
0
Fork 0
Code Activity

gnu: alacritty: Use packaged rust-wayland-client.

Browse source 
* gnu/packages/terminals.scm (alacritty)[arguments]: Remove
rust-wayland-client-0.28 from cargo-inputs. In custom
'add-absolute-library-references remove substitutions for
rust-wayland-client.
[inputs]: Add rust-wayland-client-0.28.
This commit is contained in:
Efraim Flashner 2021-03-15 14:47:23 +02:00
parent 190e94b278
commit f69a3fe28c
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/terminals.scm
View file

@ -1250,7 +1250,6 @@ made by suckless.")
("rust-time" ,rust-time-0.1) ("rust-time" ,rust-time-0.1)
("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-urlocator" ,rust-urlocator-0.1) ("rust-urlocator" ,rust-urlocator-0.1)
("rust-wayland-client" ,rust-wayland-client-0.28)
("rust-winapi" ,rust-winapi-0.3) ("rust-winapi" ,rust-winapi-0.3)
("rust-x11-dl" ,rust-x11-dl-2) ("rust-x11-dl" ,rust-x11-dl-2)
("rust-xdg" ,rust-xdg-2)) ("rust-xdg" ,rust-xdg-2))
@ -1269,13 +1268,7 @@ made by suckless.")
(smithay-client-toolkit-src (smithay-client-toolkit-src
(string-append smithay-client-toolkit-name "-" (string-append smithay-client-toolkit-name "-"
smithay-client-toolkit-version ".tar.gz/src")) 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")) (libxkbcommon (assoc-ref inputs "libxkbcommon"))
(libwayland (assoc-ref inputs "wayland"))
(mesa (assoc-ref inputs "mesa"))) (mesa (assoc-ref inputs "mesa")))
;; Fix dlopen()ing some libraries on pure Wayland (no $DISPLAY): ;; Fix dlopen()ing some libraries on pure Wayland (no $DISPLAY):
;; Failed to initialize any backend! Wayland status: NoWaylandLib ;; Failed to initialize any backend! Wayland status: NoWaylandLib
@ -1288,22 +1281,6 @@ made by suckless.")
"/seat/keyboard/ffi.rs") "/seat/keyboard/ffi.rs")
(("libxkbcommon\\.so") (("libxkbcommon\\.so")
(string-append libxkbcommon "/lib/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")))
;; Mesa is needed everywhere. ;; Mesa is needed everywhere.
(substitute* (substitute*
@ -1367,8 +1344,9 @@ made by suckless.")
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("libxxf86vm" ,libxxf86vm) ("libxxf86vm" ,libxxf86vm)
("wayland" ,wayland) ("mesa" ,mesa)
("mesa" ,mesa))) ("rust-wayland-client" ,rust-wayland-client-0.28)
("wayland" ,wayland)))
(native-search-paths (native-search-paths
;; FIXME: This should only be located in 'ncurses'. Nonetheless it is ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is
;; provided for usability reasons. See <https://bugs.gnu.org/22138>. ;; provided for usability reasons. See <https://bugs.gnu.org/22138>.