From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 70053@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#70053] [PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so.
Date: Thu, 28 Mar 2024 13:02:24 +0000 [thread overview]
Message-ID: <d5a7866dc65b5a36d717a028c7ff5bfbb2b36d3d.1711630844.git.sharlatanus@gmail.com> (raw)
This to resolve Alacritty segmentation fault reported in #68243, attemp
to fix in #69797.
* gnu/packages/crates-graphics.scm (rust-xkbcommon-dl) [arguments]:
Handle libxkbcommon-x11.so in the ‘add-absolute-library-references’
phase.
Change-Id: Ib724775210cfad7dedaa454f0f456c0dded67dcc
---
gnu/packages/crates-graphics.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index f95a4a65cd..117b4f5603 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5745,7 +5746,18 @@ (define-public rust-xkbcommon-dl-0.4
("rust-dlib" ,rust-dlib-0.5)
("rust-log" ,rust-log-0.4)
("rust-once-cell" ,rust-once-cell-1)
- ("rust-xkeysym" ,rust-xkeysym-0.2))))
+ ("rust-xkeysym" ,rust-xkeysym-0.2))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'configure 'add-absolute-library-references
+ (lambda* (#:key inputs vendor-dir #:allow-other-keys)
+ (substitute* (find-files vendor-dir "\\.rs$")
+ (("libxkbcommon-x11\\.so")
+ (search-input-file inputs "lib/libxkbcommon-x11.so"))
+ (("libxkbcommon\\.so")
+ (search-input-file inputs "lib/libxkbcommon.so"))))))))
+ (inputs
+ (list libxkbcommon))
(home-page "https://github.com/rust-windowing/xkbcommon-dl")
(synopsis "Dynamically loaded xkbcommon and xkbcommon-x11 Rust bindings")
(description
base-commit: fb9549164520ad993c2fbbaedc899844d57baabc
--
2.41.0
next reply other threads:[~2024-03-28 13:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 13:02 Sharlatan Hellseher [this message]
2024-03-29 19:10 ` bug#70053: [PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so Sharlatan Hellseher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d5a7866dc65b5a36d717a028c7ff5bfbb2b36d3d.1711630844.git.sharlatanus@gmail.com \
--to=sharlatanus@gmail.com \
--cc=70053@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.