aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-05-06 14:22:59 +0300
committerEfraim Flashner <efraim@flashner.co.il>2021-05-06 14:27:55 +0300
commit2e4f61908b0214290fc58398355316ceb40b625f (patch)
tree2cdb559de772d881730677b39334560fe0731455
parent0d6eb69266535c1570b8b85c9e88872de34626e5 (diff)
downloadguix-2e4f61908b0214290fc58398355316ceb40b625f.tar.gz
guix-2e4f61908b0214290fc58398355316ceb40b625f.zip
gnu: translate-shell: Adjust to changes in emacs-build-system.
* gnu/packages/dictionaries.scm (translate-shell)[arguments]: Replace custom 'emacs-install phase with the 'install phase from the emacs-build-system. Also add 'emacs-make-autoload and 'emacs-autoloads-completion phases from the emacs-build-system. Adjust modules and imported modules accordingly.
-rw-r--r--gnu/packages/dictionaries.scm17
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index c4c377580c..30995bf986 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -277,17 +277,18 @@ and a Python library.")
rlwrap "/bin")))))
#t))
(add-after 'install 'emacs-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (dest (string-append out "/share/emacs/site-lisp"))
- (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")))
- (install-file "google-translate-mode.el" dest)
- (emacs-generate-autoloads ,name dest)))))
+ (assoc-ref emacs:%standard-phases 'install))
+ (add-after 'emacs-install 'emacs-make-autoloads
+ (assoc-ref emacs:%standard-phases 'make-autoloads))
+ (add-after 'emacs-make-autoloads 'emacs-autoloads-compilation
+ (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)))
#:make-flags (list (string-append "PREFIX=" %output)
"NETWORK_ACCESS=no test")
- #:imported-modules (,@%gnu-build-system-modules (guix build emacs-utils))
+ #:imported-modules (,@%gnu-build-system-modules
+ (guix build emacs-build-system)
+ (guix build emacs-utils))
#:modules ((guix build gnu-build-system)
- (guix build emacs-utils)
+ ((guix build emacs-build-system) #:prefix emacs:)
(guix build utils))
#:test-target "test"))
(inputs