diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2018-04-01 13:22:19 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2018-04-01 13:40:00 +0300 |
| commit | c45f039c35cb8eaf9b5a358840c3a0b9786988a9 (patch) | |
| tree | 30c297c1c1ab223a165d5e4d59fe9d9c58776759 | |
| parent | local: emacs-terminal-here-checkout: Update to 1.0-1.918b389. (diff) | |
| download | guix-local-c45f039c35cb8eaf9b5a358840c3a0b9786988a9.tar.gz | |
local: emacs-guix-local-checkout: Update.
* local/packages/emacs.scm (emacs-guix-local-checkout): Update.
| -rw-r--r-- | local/packages/emacs.scm | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/local/packages/emacs.scm b/local/packages/emacs.scm index 5b1242e..b7defe0 100644 --- a/local/packages/emacs.scm +++ b/local/packages/emacs.scm @@ -5,6 +5,7 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages emacs) #:use-module (gnu packages pkg-config) @@ -73,7 +74,7 @@ capturing user input and paste it with @kbd{C-v} after exit.") (license license:gpl3+)))) (define-public emacs-guix-local-checkout - (let ((commit "1d0d3ddf9bf2145a17235dab421cbb4108c89c47") + (let ((commit "c6f21c71e48efb1362bc063dd10020e2e6fda5b9") (revision "1")) (package (inherit emacs-guix) @@ -88,21 +89,25 @@ capturing user input and paste it with @kbd{C-v} after exit.") (file-name (git-file-name name version)) (sha256 (base32 - "15d3frpvl2hk7r207503mp38yhlw6dhmd6dmnh3n5p08sfyaa7f0")))) + "0pp4jsfby08g0xlsn40a44lsk2vk232g9zjx6zv11rsgrlvrzvq3")))) (arguments - (append (package-arguments emacs-guix) - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ (zero? (system* "sh" "autogen.sh")))))))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ (zero? (system* "sh" "autogen.sh"))))) + ,@(substitute-keyword-arguments (package-arguments emacs-guix) + ((#:configure-flags flags) + `(cons (string-append "--with-editindirect-lispdir=" + (assoc-ref %build-inputs "emacs-edit-indirect") + "/share/emacs/site-lisp/guix.d/edit-indirect-" + ,(package-version emacs-edit-indirect)) + ,flags))))) (native-inputs - `(("pkg-config" ,pkg-config) - ;; 'emacs-minimal' does not find Emacs packages (this is for - ;; "guix environment"). - ("emacs" ,emacs-no-x) + `(("emacs-edit-indirect" ,emacs-edit-indirect) ("autoconf" ,autoconf) ("automake" ,automake) - ("texinfo" ,texinfo)))))) + ("texinfo" ,texinfo) + ,@(package-native-inputs emacs-guix)))))) (define-public emacs-terminal-here-checkout (let ((commit "918b3894baaa475e30d86b389ddca73a5ea58638")) |