[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#67260] [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH.
From: |
Liliana Marie Prikler |
Subject: |
[bug#67260] [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. |
Date: |
Mon, 22 Jan 2024 21:21:26 +0100 |
* gnu/packages/emacs.scm (emacs-minimal)[wrap-emacs-paths]: Also wrap
EMACSNATIVELOADPATH.
---
gnu/packages/emacs.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 5f27c551e0..2cdc9b8bca 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -273,7 +273,11 @@ (define-public emacs-minimal
(let* ((out (assoc-ref outputs "out"))
(lisp-dirs (find-files (string-append out "/share/emacs")
"^lisp$"
- #:directories? #t)))
+ #:directories? #t))
+ (native-lisp-dirs (find-files
+ (string-append out "/lib/emacs")
+ "^native-lisp$"
+ #:directories? #t)))
(for-each
(lambda (prog)
(wrap-program prog
@@ -285,7 +289,11 @@ (define-public emacs-minimal
(list (search-input-file inputs "/bin/gzip")
;; for coreutils
(search-input-file inputs "/bin/yes"))))
- `("EMACSLOADPATH" suffix ,lisp-dirs)))
+ `("EMACSLOADPATH" suffix ,lisp-dirs)
+ ;; Note: the interpretation order of EMACSNATIVELOADPATH
+ ;; is reversed, so 'prefix functions just like 'suffix
+ ;; for EMACSLOADPATH.
+ `("EMACSNATIVELOADPATH" prefix ,native-lisp-dirs)))
(find-files (string-append out "/bin")
;; Matches versioned and unversioned emacs
binaries.
;; We don't patch emacsclient, because it takes
its
base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660
--
2.41.0
- [bug#67260] [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH.,
Liliana Marie Prikler <=
- [bug#67260] [PATCH v8 2/7] gnu: emacs: Build trampolines., Liliana Marie Prikler, 2024/01/27
- [bug#67260] [PATCH v8 5/7] build-system: emacs: Compute relative file names., Liliana Marie Prikler, 2024/01/27
- [bug#67260] [PATCH v8 3/7] gnu: emacs: Don't hash file names in native compilation., Liliana Marie Prikler, 2024/01/27
- [bug#67260] [PATCH v8 4/7] gnu: emacs: Disable jit compilation., Liliana Marie Prikler, 2024/01/27
- [bug#67260] [PATCH v8 6/7] gnu: emacs-org: Fix native builds., Liliana Marie Prikler, 2024/01/27
- [bug#67260] [PATCH v8 7/7] gnu: emacs-magit: Fix native builds., Liliana Marie Prikler, 2024/01/27