From patchwork Thu Mar 14 13:55:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 61799 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 75D0527BBEA; Thu, 14 Mar 2024 13:57:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 869B627BBE9 for ; Thu, 14 Mar 2024 13:57:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rklaL-0000j0-Vs; Thu, 14 Mar 2024 09:57:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rklaJ-0000ib-Gg for guix-patches@gnu.org; Thu, 14 Mar 2024 09:57:27 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rklaI-0004I3-PO for guix-patches@gnu.org; Thu, 14 Mar 2024 09:57:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rklas-0003vY-CS; Thu, 14 Mar 2024 09:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69797] [PATCH] gnu: alacritty: Fix loading of libxkbcommon-x11.so. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Thu, 14 Mar 2024 13:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69797 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69797@debbugs.gnu.org Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by submit@debbugs.gnu.org id=B.171042465415058 (code B ref -1); Thu, 14 Mar 2024 13:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Mar 2024 13:57:34 +0000 Received: from localhost ([127.0.0.1]:50389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rklaQ-0003uo-3F for submit@debbugs.gnu.org; Thu, 14 Mar 2024 09:57:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:43092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rklaM-0003ue-Ia for submit@debbugs.gnu.org; Thu, 14 Mar 2024 09:57:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rklZm-0000g8-Bg for guix-patches@gnu.org; Thu, 14 Mar 2024 09:56:54 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rklZg-0004FG-MA for guix-patches@gnu.org; Thu, 14 Mar 2024 09:56:51 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id C1FFB3200A08; Thu, 14 Mar 2024 09:56:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 14 Mar 2024 09:56:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1710424601; x=1710511001; bh=ls EQ7lmf9c6br/yzihul9HtgKdloqONNU1K+xLT7dGA=; b=R8TMqnfhllpAI6BqJc y0KeyMsCteE2jMQKrtx6NQPw6umyow2imtF72Qz8v4sGryuMiAxBvAoDMDpxmXvL s1w76DISqGS/LoYYs2kwiM3W03tyhkdPrMlqpnCFrwN5dgpwvZBBUTj4HEDoQq1K eT13xxY9+LO3jDoLzCEbtC9VR9ahvHetG5sbqVwYeqZdOX4ztTrKfjJ0fzWpS+Iz 881cVkqzp7fGB2KkruXIthnVhTOYd6GBYolZGGh0iPS1xWar+lpV0IFxUn2WtJ/S fmGc62sTOLWB2bAq2vEfZbcAs8K9zvSYXYTg/ICX3DzOdaVOwX5D7oaEDcROJhJ4 x1jQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1710424601; x=1710511001; bh=lsEQ7lmf9c6br /yzihul9HtgKdloqONNU1K+xLT7dGA=; b=mQZo3i7J7djSGdwj2SQRStETepoUE KZlQvMmuheLMz8QgYJ85iQo5CILY73Dmk5rLImta77SOB3c2hgbpFUPCVXMEvjQs cJy7ululNr9772IWvl64JaGkdnuzbJrmAgvCLHeVRpXCYM3HBzq/lk7NfCCMKXT/ U9Tga3f/ca/TcDujwZSQ2seG0n9yHgeQ8GpUdqgLKbxgwFzkYD+wIqve8M/dYgO1 rNTNDn3idmUls2MUyKCXRGQsqeTfqnc94hiPHQvKC2aCtdf5poF3/myu1X2a2u2B Dq4cwLtDNAdhKrLXdrD+vXtEZAHZdNUg4dI2bU05CmBNHBvN6ncxeaJfA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrjeejgdehiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpeevlhormhgvnhhtucfnrghsshhivghurhcuoegtlhgvmhgvnhht sehlrghsshhivghurhdrohhrgheqnecuggftrfgrthhtvghrnhepjedvhfehueettedthf eghfehtdetffevfefffeelffefteeiteekjedtfeevtefgnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuh hrrdhorhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Mar 2024 09:56:39 -0400 (EDT) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Thu, 14 Mar 2024 14:55:29 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.19; envelope-from=clement@lassieur.org; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/terminals.scm (alacritty)[arguments]: Handle libxkbcommon-x11.so in the ‘add-absolute-library-references’ phase. This fixes this error: thread 'main' panicked at /tmp/guix-build-alacritty-0.13.1.drv-0/source/guix-vendor/rust-xkbcommon-dl-0.4.1.tar.gz/src/x11.rs:59:28: Library libxkbcommon-x11.so could not be loaded. note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace Change-Id: Ifbf19b4962bc3d9eeba6acdf32ca66b0c662f493 --- gnu/packages/terminals.scm | 3 +++ 1 file changed, 3 insertions(+) base-commit: dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 49c42c8fcb98..f0ae4d4d4d61 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Jaeme Sifat ;;; Copyright © 2024 Suhail +;;; Copyright © 2024 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -1604,6 +1605,8 @@ (define-public alacritty (search-input-file inputs (string-append "lib/" all))) (("libwayland-[[:alpha:]]*\\.so" all) (search-input-file inputs (string-append "lib/" all))) + (("libxkbcommon-x11\\.so") + (search-input-file inputs "lib/libxkbcommon-x11.so")) (("libxkbcommon\\.so") (search-input-file inputs "lib/libxkbcommon.so"))))) (replace 'install