From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KIZ7COoq3V/oJAAA0tVLHw (envelope-from ) for ; Fri, 18 Dec 2020 22:19:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yIFDBOoq3V+yYgAAbx9fmQ (envelope-from ) for ; Fri, 18 Dec 2020 22:19:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8B98A940667 for ; Fri, 18 Dec 2020 22:19:21 +0000 (UTC) Received: from localhost ([::1]:51544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqO5o-0007RR-AC for larch@yhetil.org; Fri, 18 Dec 2020 17:19:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqO5a-0007Nm-4m for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kqO5Z-00071B-R9 for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kqO5Z-0000D3-Nd for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:05 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45316: [PATCH 11/26] gnu: emacs-edbi: Adjust following emacs-build-system changes. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 18 Dec 2020 22:19:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45316 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 45316@debbugs.gnu.org Received: via spool by 45316-submit@debbugs.gnu.org id=B45316.1608329917594 (code B ref 45316); Fri, 18 Dec 2020 22:19:05 +0000 Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:37 +0000 Received: from localhost ([127.0.0.1]:40298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqO57-00009Q-46 for submit@debbugs.gnu.org; Fri, 18 Dec 2020 17:18:37 -0500 Received: from mail-qk1-f177.google.com ([209.85.222.177]:33048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqO4t-00005l-Uz for 45316@debbugs.gnu.org; Fri, 18 Dec 2020 17:18:24 -0500 Received: by mail-qk1-f177.google.com with SMTP id f26so1967639qka.0 for <45316@debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YMWkgYqc+kQeOzYf1iKQ08YOUDPs3+kw7l5bceqvpo0=; b=m1eWmL52S2f/qAyAVtmzf1haVXCqBM+yikZO3P9TLpZzWU7dQSFqsFtTfolizLKL1G NQjf1GURkILpvrD7Q+H1Hlpbx0M+yo98T6SEGOXgIuL21ROAPadNdhP/h2QuyLIqhpg6 lN2aBX0Ujx1r1ECG/g8IfQSALu6MwImG5QNXkPnNhlz7lOQXdoMsRaQlBLiPteSbigx+ mJjC/RzWtKEjeENOtuvBnpZu4uSRMkKlX7fXUcZhFUctaOcypiUeTG/J0y4xMIyVXb1l 8EBQHZn5EK2Rm9ug7X7z2V+DHwBHT41a3EWpCT8Q15E7wr0rrFfwE0soSzjbbZy6ib3v oE6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YMWkgYqc+kQeOzYf1iKQ08YOUDPs3+kw7l5bceqvpo0=; b=Oq9ooQA/E1Xfb7ddnew22a2twngz27OMRxkr0HeZ9MXVHGe0wPqNrXhQkyF8p+bqqT izoeABAmip6iZAcI6SmGwnx6KgM52P7geLcz54h6+AyJM0c5KxQvhfQdBRfIgxaJO3zs 6C8IsQaYK4LtP6mlJCgIuJh/5XR/JxcjTdmPPhukVTprt5ZP+R/0xWKlVixEdwpQbc+f 2u4OMRSJW01YkCx1C4Hcf9szRVu/szN76OvsFJLAAAeZE1utbz4AQxM79MAfun87PdXh vFpVsz25iBxcV4GPgk5ZvAI/KBpysfDTlGBVma3s8mL7QGpHNIq4zGo50O4t8hWCjuTN Pnug== X-Gm-Message-State: AOAM531rjQnzdfc5HlbB1cAA9y8EGCXhI2EFAwEeCr4+bZNPqrsZ0M9X OmfF6sYDNW5CnQfHnFlsWgQappw3TVgy/th6 X-Google-Smtp-Source: ABdhPJyc4XTlfwfho/V9OzLVtYY9eq7bKTNReZ/ryEk8nj+P6P5VvNBwyyRUSVuaPpwY7rCLvhtmAQ== X-Received: by 2002:a37:a713:: with SMTP id q19mr7282200qke.23.1608329898455; Fri, 18 Dec 2020 14:18:18 -0800 (PST) Received: from localhost.localdomain (dsl-10-146-235.b2b2c.ca. [72.10.146.235]) by smtp.gmail.com with ESMTPSA id b78sm1876162qkg.29.2020.12.18.14.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 14:18:17 -0800 (PST) From: Maxim Cournoyer Date: Fri, 18 Dec 2020 17:17:08 -0500 Message-Id: <20201218221723.26829-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201218221723.26829-1-maxim.cournoyer@gmail.com> References: <20201218221723.26829-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Cournoyer Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=m1eWmL52; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 8B98A940667 X-Spam-Score: 2.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: yaG6Si6ECdKc * gnu/packages/emacs-xyz.scm (emacs-edbi)[arguments] {include}: Extend rather than override %default-include. [phases]{patch-path}: Adjust installation prefix. edb# buffering.patch --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ff904af19..3e4dae5314 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20330,14 +20330,13 @@ asynchronous communications, the RPC response is fairly good.") `(("emacs-e2wm" ,emacs-e2wm) ("emacs-epc" ,emacs-epc))) (arguments - `(#:include '("\\.el$" "\\.pl$") + `(#:include (cons "^[^/]*\\.pl$" %default-include) #:phases (modify-phases %standard-phases (add-after 'install 'patch-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl")) - (dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp"))) + (dir (outputs->elpa-install-dir outputs))) (substitute* (string-append dir "/edbi.el") (("\"perl\"") (string-append "\"" perl "/bin/perl\""))) (chmod (string-append dir "/edbi-bridge.pl") #o555) -- 2.29.2