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 8HZQEegq3V95GAAA0tVLHw (envelope-from ) for ; Fri, 18 Dec 2020 22:19:20 +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 8JgPDegq3V9oZAAAbx9fmQ (envelope-from ) for ; Fri, 18 Dec 2020 22:19:20 +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 B0B2C940396 for ; Fri, 18 Dec 2020 22:19:18 +0000 (UTC) Received: from localhost ([::1]:51400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqO5l-0007L9-63 for larch@yhetil.org; Fri, 18 Dec 2020 17:19:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqO5W-0007Kd-Fm for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kqO5W-0006zj-8P for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kqO5W-0000Bz-3l for bug-guix@gnu.org; Fri, 18 Dec 2020 17:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45316: [PATCH 02/26] gnu: emacs-ert-runner: 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:02 +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.1608329898347 (code B ref 45316); Fri, 18 Dec 2020 22:19:02 +0000 Received: (at 45316) by debbugs.gnu.org; 18 Dec 2020 22:18:18 +0000 Received: from localhost ([127.0.0.1]:40257 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqO4o-00005W-1o for submit@debbugs.gnu.org; Fri, 18 Dec 2020 17:18:18 -0500 Received: from mail-qv1-f44.google.com ([209.85.219.44]:32822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqO4m-000055-PD for 45316@debbugs.gnu.org; Fri, 18 Dec 2020 17:18:17 -0500 Received: by mail-qv1-f44.google.com with SMTP id a13so1700035qvv.0 for <45316@debbugs.gnu.org>; Fri, 18 Dec 2020 14:18:16 -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=Y0EcIAOoMuzTb567QJpC8VcHEnJ3eAYa/aP4ToglpjU=; b=fvKIukD0OqBCDuLA86qhypAt4xmHAAAYP/DYoHT9JPZpS5enn9wR6grIlEEaKCC9o5 hl6TP2kSoDRrF26BR22NRquoAos3qdRlnrwZ/d/SBcXchroAQ8BeapcDIoHsx0jaXMKR aW2KOTjORBcssYypVBNuevTz3hS/AnNPcJuWX+DSIknkjpjfupot0boDqvT/NpEszpKw PczfK1e/P/26pHXFNwjgK+KGBBlNA2PjvcAh9EKqYYAGKlFfsHF7nD54E+7b+b5fi0rA h+rGTn1rlVb0z5eIoKfuSFAmB0jELY4pfVF4ias3w9MOjFjKMLN1FUaNSF0Nz1d+uUWG Py1g== 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=Y0EcIAOoMuzTb567QJpC8VcHEnJ3eAYa/aP4ToglpjU=; b=D6FLXB/EaypAApbceWyYLaN3UB6m1uHUyEMeEO5WF6gh3z0NLS31eFfOYY34Ez+kCN T9ejANfcGtyR2A2XdIcGScCl7O/vhtkNRKVmJMROekArG0ddOeXfxjbUVXKEGcWXl9z+ n842MhdcTMymy9n37eZF8MWjVbRJ1CXRdq5yi0mHdQiTfOLfCH7EqIn1lqhHsfyNHbpO GUqZCr/mh0WCDFKsBd0QyrbHHOor6sXjsjDPNx4k4gps06MIraeH7ElQhzArvSEA/KGQ xVyEXB/Hl6ckiSfJejPOErGp2FMuFiLG0EDcezpdiv0wsSrStq7f5m2+GHUeJqlJnnBX o9kQ== X-Gm-Message-State: AOAM531MLMALMGpFyQiy3Mvyqss9NFHgMkqco6z2SkjtaQuBv9FiPR4y Im5DkKaPUaGTNuq9Bbu5gGi/MVx/d7nPqhXM X-Google-Smtp-Source: ABdhPJwDIsxP9SoenxqsysjQtt29AOfuBcHAQHQWjEXntag2gl3Yxhi/vwHu0FsKZnqc3TJ1BxgiRw== X-Received: by 2002:a05:6214:a03:: with SMTP id dw3mr6982516qvb.24.1608329891201; Fri, 18 Dec 2020 14:18:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 14:18:10 -0800 (PST) From: Maxim Cournoyer Date: Fri, 18 Dec 2020 17:16:59 -0500 Message-Id: <20201218221723.26829-2-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=fvKIukD0; 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: B0B2C940396 X-Spam-Score: 2.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: KSD+5bHhbq1g * gnu/packages/emacs-xyz.scm (emacs-ert-runner)[phases]{patch-launcher}: New phase. {install-executable}: Adjust. --- gnu/packages/emacs-xyz.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e242bcf5a8..6ae301aeaf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12367,6 +12367,14 @@ one if it fails.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + ;; Do not use -Q, as this implies not loading site-start.el, which + ;; is required to make Guix Elisp library packages discoverable. + (lambda _ + (substitute* "bin/ert-runner" + (("-Q") + (string-join %emacs-quick-arguments))) + #t)) (add-after 'install 'install-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -12374,8 +12382,8 @@ one if it fails.") (getenv "TMPDIR") "/source"))) (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp"))) + (string-append "ERT_RUNNER=\"" + (outputs->elpa-install-dir outputs)))) (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix -- 2.29.2