[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#45316: [PATCH 02/26] gnu: emacs-ert-runner: Adjust following emacs-b
From: |
Maxim Cournoyer |
Subject: |
bug#45316: [PATCH 02/26] gnu: emacs-ert-runner: Adjust following emacs-build-system changes. |
Date: |
Fri, 18 Dec 2020 17:16:59 -0500 |
* 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
- bug#45316: [PATCH]: Re-introduce Emacs packages specific installation prefix., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 01/26] build-systems/emacs: Install packages in their own directory., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 02/26] gnu: emacs-ert-runner: Adjust following emacs-build-system changes.,
Maxim Cournoyer <=
- bug#45316: [PATCH 04/26] gnu: cedille: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 03/26] gnu: emacs-xyz: Do not use --quick or -Q., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 08/26] gnu: emacs-scel: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 05/26] gnu: emacs-libgit: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 06/26] gnu: emacs-typit: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 07/26] gnu: emacs-flycheck-grammalecte: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 11/26] gnu: emacs-edbi: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 10/26] gnu: emacs-org-contrib: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 09/26] gnu: emacs-chess: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18
- bug#45316: [PATCH 12/26] gnu: emacs-telega: Adjust following emacs-build-system changes., Maxim Cournoyer, 2020/12/18