From d07b375d6d0a1c354587b285a2547aee8f6e9f96 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Wed, 23 Jun 2021 15:57:40 +1000 Subject: [PATCH 1/2] gnu: Fix references to emacs-build-system's expand-load-path phase * gnu/packages/emacs-xyz.scm (emacs-pdf-tools): Change reference from emacs-add-source-to-load-path to emacs-expand-load-path * gnu/packages/erlang.scm (emacs-erlang): Change reference from add-source-to-load-path to expand-load-path * gnu/packages/protobuf.scm (emacs-protobuf-mode): Change reference from add-source-to-load-path to expand-load-path --- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/erlang.scm | 2 +- gnu/packages/protobuf.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eef33fd437..28b87d49dd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3310,7 +3310,7 @@ during idle time, while Emacs is doing nothing else.") ("pdf-tools-handle-upgrades" '())))) (add-after 'emacs-patch-variables 'emacs-expand-load-path (assoc-ref emacs:%standard-phases 'expand-load-path)) - (add-after 'emacs-add-source-to-load-path 'emacs-install + (add-after 'emacs-expand-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 7b5dc70b5d..d52d5c3983 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -232,7 +232,7 @@ built-in support for concurrency, distribution and fault tolerance.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'change-working-directory + (add-before 'expand-load-path 'change-working-directory (lambda _ (chdir "lib/tools/emacs") #t))))) (home-page "https://www.erlang.org/") (synopsis "Erlang major mode for Emacs") diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 857adf1703..9c6dcb51cc 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -311,7 +311,7 @@ structured data.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'change-working-directory + (add-before 'expand-load-path 'change-working-directory (lambda _ (chdir "editors") #t))))) (home-page "https://github.com/protocolbuffers/protobuf") (synopsis "Protocol buffers major mode for Emacs") -- 2.32.0