From patchwork Wed Jan 1 10:15:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivan Kozlov X-Patchwork-Id: 19509 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 9A74F179D5; Wed, 1 Jan 2020 17:24:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 641E1179D3 for ; Wed, 1 Jan 2020 17:24:22 +0000 (GMT) Received: from localhost ([::1]:60346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imhjJ-00021P-V6 for patchwork@mira.cbaines.net; Wed, 01 Jan 2020 12:24:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54717) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imhj6-0001rQ-PI for guix-patches@gnu.org; Wed, 01 Jan 2020 12:24:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imhj1-0002zR-Sq for guix-patches@gnu.org; Wed, 01 Jan 2020 12:24:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imhj0-0002w2-Ca for guix-patches@gnu.org; Wed, 01 Jan 2020 12:24:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imhj0-0003kI-8h for guix-patches@gnu.org; Wed, 01 Jan 2020 12:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38848] Fix path substitution in IBus Resent-From: kanichos@yandex.ru Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jan 2020 17:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38848 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 38848@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157789943714369 (code B ref -1); Wed, 01 Jan 2020 17:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jan 2020 17:23:57 +0000 Received: from localhost ([127.0.0.1]:37507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imhiu-0003jf-Q2 for submit@debbugs.gnu.org; Wed, 01 Jan 2020 12:23:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:32828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1imb2j-0005NP-C3 for submit@debbugs.gnu.org; Wed, 01 Jan 2020 05:15:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55689) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imb2h-00008e-Uv for guix-patches@gnu.org; Wed, 01 Jan 2020 05:15:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imb2f-0001D4-VP for guix-patches@gnu.org; Wed, 01 Jan 2020 05:15:54 -0500 Received: from forward102j.mail.yandex.net ([5.45.198.243]:42820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imb2f-00016U-ER for guix-patches@gnu.org; Wed, 01 Jan 2020 05:15:53 -0500 Received: from mxback12o.mail.yandex.net (mxback12o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::63]) by forward102j.mail.yandex.net (Yandex) with ESMTP id EC566F20315 for ; Wed, 1 Jan 2020 13:15:49 +0300 (MSK) Received: from localhost (localhost [::1]) by mxback12o.mail.yandex.net (mxback/Yandex) with ESMTP id RPUgdxgptM-Fn7mYfVx; Wed, 01 Jan 2020 13:15:49 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1577873749; bh=HMGE81d8CA9mHgd1R8rEd7HrwljeqUtQCDArqLdK8Gk=; h=Message-Id:Date:Subject:To:From; b=hj6fvLgzz10WlMVIzdOaGscvoOXe5auZT+NQe+NzmalB5zJ2If2Opdso3C4A5liQT kL2VLBg4vmA2HbQ28yocwTteDAkF/39mnIBPDgDgl+C/E9XkimuMR7l0uyKWanrsq5 xl/Ztjl5up5HAPTsDtLfO6iup3Lgu96OkwNuxzWI= Authentication-Results: mxback12o.mail.yandex.net; dkim=pass header.i=@yandex.ru Received: by myt5-b646bde4b8f3.qloud-c.yandex.net with HTTP; Wed, 01 Jan 2020 13:15:49 +0300 From: kanichos@yandex.ru MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Wed, 01 Jan 2020 13:15:49 +0300 Message-Id: <66851577873749@myt5-b646bde4b8f3.qloud-c.yandex.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Mailman-Approved-At: Wed, 01 Jan 2020 12:23:55 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches The IBus package has been broken since forever because it substitutes paths to setxkbmap and xmodmap binaries with package directories. --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.23.0 diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 5057927174..42a8d5db32 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -116,7 +116,7 @@                                "/share/X11/locale")))              (substitute* "ui/gtk3/xkblayout.vala"                (("\"(setxkbmap|xmodmap)\"" _ prog) -                (string-append "\"" (assoc-ref inputs prog) "\""))) +                (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\"")))              #t))          (add-after 'wrap-program 'wrap-with-additional-paths            (lambda* (#:key outputs #:allow-other-keys)