1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-13 10:30:43 +02:00

gnu: emacs: Pin natively compiled packages.

* gnu/packages/patches/emacs-native-comp-pin-packages.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/emacs.scm (emacs)[source]: Use it here.
[#:phases]: Remove ‘disable-native-compilation’.

Fixes: Emacs native-comp collisions <https://issues.guix.gnu.org/67292>
This commit is contained in:
Liliana Marie Prikler 2024-12-08 18:30:54 +01:00
parent 71db233a7d
commit 8f799ca8ce
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
3 changed files with 41 additions and 10 deletions

View file

@ -117,6 +117,7 @@
"emacs-fix-scheme-indent-function.patch"
"emacs-native-comp-driver-options.patch"
"emacs-native-comp-fix-filenames.patch"
"emacs-native-comp-pin-packages.patch"
"emacs-pgtk-super-key-fix.patch"))
(modules '((guix build utils)))
(snippet
@ -233,16 +234,6 @@
(("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process)
(format #f "(or ~a (tramp-compat-process-running-p ~s))"
all (string-append "." process "-real"))))))
(add-after 'unpack 'disable-native-compilation
(lambda _
;; Temporary workaround to prevent the behaviour discussed in
;; <https://issues.guix.gnu.org/72333>.
;; Please remove once the native-compilation for Emacs packages
;; is fully supported.
(substitute* "lisp/transient.el"
((";; End:")
";; no-native-compile: t
;; End:"))))
(add-before 'configure 'fix-/bin/pwd
(lambda _
;; Use `pwd', not `/bin/pwd'.