[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: emacs-ert-runner: Fix lisp directory warning.
From: |
guix-commits |
Subject: |
01/01: gnu: emacs-ert-runner: Fix lisp directory warning. |
Date: |
Tue, 5 Feb 2019 10:10:17 -0500 (EST) |
apteryx pushed a commit to branch master
in repository guix.
commit f9dff4f7fa2732ca753d5bb6e6a43231b429b35b
Author: Maxim Cournoyer <address@hidden>
Date: Tue Jan 22 05:33:19 2019 +0000
gnu: emacs-ert-runner: Fix lisp directory warning.
This fixes the warning message such as: "Warning: Lisp directory
'/tmp/guix-build-emacs-ert-runner-0.7.0-1.90b8fdd.drv-0/source': No such
file
or directory" that would be printed upon running ert-runner.
* gnu/packages/emacs-xyz.scm (emacs-ert-runner)[phases]{install-executable}:
Filter out the temporary source directory from the paths composing the
EMACSLOADPATH variable used in the wrapper.
---
gnu/packages/emacs-xyz.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e337ea3..d1d88ce 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6959,7 +6959,9 @@ Emacs.")
(modify-phases %standard-phases
(add-after 'install 'install-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
+ (let ((out (assoc-ref outputs "out"))
+ (source-directory (string-append
+ (getenv "TMPDIR") "/source")))
(substitute* "bin/ert-runner"
(("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)")
(string-append "ERT_RUNNER=\"" out
@@ -6968,7 +6970,10 @@ Emacs.")
(install-file "bin/ert-runner" (string-append out "/bin"))
(wrap-program (string-append out "/bin/ert-runner")
(list "EMACSLOADPATH" ":" 'prefix
- (string-split (getenv "EMACSLOADPATH") #\:)))
+ ;; Do not capture the transient source directory in
+ ;; the wrapper.
+ (delete source-directory
+ (string-split (getenv "EMACSLOADPATH") #\:))))
#t))))
#:include (cons* "^reporters/.*\\.el$" %default-include)))
(home-page "https://github.com/rejeep/ert-runner.el")