[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47661] [PATCH v2 03/33] gnu: emacs: Add coreutils and gzip to PATH.
From: |
Leo Prikler |
Subject: |
[bug#47661] [PATCH v2 03/33] gnu: emacs: Add coreutils and gzip to PATH. |
Date: |
Sat, 17 Apr 2021 19:06:18 +0200 |
Some parts of Emacs (dired, compression handling, Tramp) shell out to commands
and patching them all is a daunting task. Also, w.r.t. Tramp, we need those
commands to be portable across multiple machines, which need not only be Guix
machines (and even if they are, store items can be different). This patch
ensures a ‘sane’ setup FSVO ‘sane’.
* gnu/packages/emacs.scm (emacs)[wrap-load-path]: Rename to...
[wrap-emacs-paths] ... this. Also patch PATH.
---
gnu/packages/emacs.scm | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e1b01ac22b..5316d25151 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -201,8 +201,8 @@
(car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
"bin/emacs")
#t)))
- (add-after 'strip-double-wrap 'wrap-load-path
- (lambda* (#:key outputs #:allow-other-keys)
+ (add-after 'strip-double-wrap 'wrap-emacs-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lisp-dirs (find-files (string-append out "/share/emacs")
"^lisp$"
@@ -210,6 +210,13 @@
(for-each
(lambda (prog)
(wrap-program prog
+ ;; emacs-next and variants rely on uname being in PATH for
+ ;; Tramp. Tramp paths can't be hardcoded, because they
+ ;; need to be portable.
+ `("PATH" suffix
+ ,(map (lambda (in) (string-append in "/bin"))
+ (list (assoc-ref inputs "gzip")
+ (assoc-ref inputs "coreutils"))))
`("EMACSLOADPATH" suffix ,lisp-dirs)))
(find-files (string-append out "/bin")
;; Matches versioned and unversioned emacs
binaries.
@@ -231,6 +238,10 @@
`(("gnutls" ,gnutls)
("ncurses" ,ncurses)
+ ;; Required for "core" functionality, such as dired and compression.
+ ("coreutils" ,coreutils)
+ ("gzip" ,gzip)
+
;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
;; only via insecure channels. This is not needed for (modern) IMAP.
("mailutils" ,mailutils)
@@ -361,7 +372,9 @@ also enabled and works without glitches even on X
server."))))
(delete 'strip-double-wrap)))))
(inputs
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
- ("ncurses" ,ncurses)))
+ ("ncurses" ,ncurses)
+ ("coreutils" ,coreutils)
+ ("gzip" ,gzip)))
(native-inputs
`(("pkg-config" ,pkg-config)))))
--
2.31.1
- [bug#47661] [PATCH 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system., (continued)
- [bug#47661] [PATCH 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 27/33] gnu: guile-studio: Add missing input., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 26/33] gnu: emacs-flycheck-guile: Add missing input., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 31/33] gnu: emacs-wget: Port to emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 28/33] gnu: geiser-gauche: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH v2 01/33] profiles: Add hook for Emacs subdirs., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 04/33] build-system: emacs: Use subdirectories again., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 07/33] gnu: emacs-telega: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 08/33] gnu: Add emacs-telega-contrib., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 03/33] gnu: emacs: Add coreutils and gzip to PATH.,
Leo Prikler <=
- [bug#47661] [PATCH v2 13/33] gnu: emacs-shroud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 11/33] gnu: emacs-ert-runner: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 21/33] gnu: emacs-pyim: Update to 3.6., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 25/33] gnu: emacs-guix: Update to 0.5.2-4.8ce6d21., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 24/33] gnu: Add emacs-geiser-guile., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17
- [bug#47661] [PATCH v2 16/33] gnu: emacs-org-contrib: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/17