From patchwork Sat Feb 22 17:11:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 20368 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 444D627BBE4; Sat, 22 Feb 2020 17:12:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1AF3F17B5D for ; Sat, 22 Feb 2020 17:12:10 +0000 (GMT) Received: from localhost ([::1]:44548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5YK1-000182-Gf for patchwork@mira.cbaines.net; Sat, 22 Feb 2020 12:12:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40372) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5YJv-00017b-9u for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5YJu-000515-45 for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43978) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5YJu-00050z-10 for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5YJt-0000zt-SI for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39740] [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of substitute*. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Feb 2020 17:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39740 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39740@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 39740-submit@debbugs.gnu.org id=B39740.15823915123811 (code B ref 39740); Sat, 22 Feb 2020 17:12:01 +0000 Received: (at 39740) by debbugs.gnu.org; 22 Feb 2020 17:11:52 +0000 Received: from localhost ([127.0.0.1]:49949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YJk-0000zN-2Z for submit@debbugs.gnu.org; Sat, 22 Feb 2020 12:11:52 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:42824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YJh-0000z7-UA for 39740@debbugs.gnu.org; Sat, 22 Feb 2020 12:11:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UqHw6P1kJnEwZ9OXYVi3f4UOLJGKtfqfXXb6PoKFYl0=; b=bY1fh308UDqqbvbR0YR1aKSkjC Tr8G2zKqAoenTb8WaIb5dKzWXhnfxarfB9YACbVaHYNvCuWuiYX+yrHx0PSGHSqguxb+dQUI+DvlZ QOPuWJC7dBmJKMSb2w3C7XkzAO9SHs4ATpbTIvC4Z4AmeXzJCpyZLvhwuZKXkimOWjgA=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1j5YJe-0013Md-Fo; Sat, 22 Feb 2020 22:41:46 +0530 From: Arun Isaac Date: Sat, 22 Feb 2020 22:41:44 +0530 Message-Id: <20200222171144.24750-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200222171144.24750-1-arunisaac@systemreboot.net> References: <20200222171144.24750-1-arunisaac@systemreboot.net> MIME-Version: 1.0 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 * gnu/packages/xorg.scm (uim)[arguments]: In the configure-uim-el phase, use emacs-substitute-variables instead of substitute*. --- gnu/packages/xorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a7ba6fe9eb..2bf920b20d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6145,10 +6145,10 @@ X11 servers, Windows, or macOS.") ;; Set path of uim-el-agent and uim-el-helper-agent executables (add-after 'configure 'configure-uim-el (lambda* (#:key outputs #:allow-other-keys) - (substitute* "emacs/uim-var.el" - (("\"(uim-el-agent|uim-el-helper-agent)\"" _ executable) - (string-append "\"" (assoc-ref outputs "out") - "/bin/" executable "\""))) + (let ((out (assoc-ref outputs "out"))) + (emacs-substitute-variables "emacs/uim-var.el" + ("uim-el-agent" (string-append out "/bin/uim-el-agent")) + ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent")))) #t)) ;; Fix installation path by renaming share/emacs/uim-el to ;; share/emacs/site-lisp