emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[debbugs-tracker] bug#29660: closed ([PATCH] gnu: notmuch: Move elisp di


From: GNU bug Tracking System
Subject: [debbugs-tracker] bug#29660: closed ([PATCH] gnu: notmuch: Move elisp directory and generate autoloads.)
Date: Wed, 13 Dec 2017 18:41:03 +0000

Your message dated Thu, 14 Dec 2017 00:10:29 +0530
with message-id <address@hidden>
and subject line Re: [bug#29660] [PATCH] gnu: notmuch: Move elisp directory and 
generate        autoloads.
has caused the debbugs.gnu.org bug report #29660,
regarding [PATCH] gnu: notmuch: Move elisp directory and generate autoloads.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
29660: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29660
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH] gnu: notmuch: Move elisp directory and generate autoloads. Date: Mon, 11 Dec 2017 19:54:52 +0530
* gnu/packages/mail.scm (notmuch)[arguments]: Move elisp files to
share/emacs/site-lisp/guix.d/notmuch-<version>.
Add make-autoloads phase.
---
 gnu/packages/mail.scm | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 21db46341..198be11ba 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -703,7 +703,13 @@ invoking @command{notifymuch} from the post-new hook.")
                 "1fyx20rjpwbf2j1v5fpa5s0rjnwhcgvijzh2qyinp8rlbh1qxmab"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:make-flags (list "V=1") ; Verbose test output.
+     `(#:modules ((guix build gnu-build-system)
+                  ((guix build emacs-build-system) #:prefix emacs:)
+                  (guix build utils))
+       #:imported-modules (,@%gnu-build-system-modules
+                           (guix build emacs-build-system)
+                           (guix build emacs-utils))
+       #:make-flags (list "V=1") ; Verbose test output.
        #:phases (modify-phases %standard-phases
                   (add-after 'unpack 'patch-notmuch-lib.el
                     (lambda _
@@ -715,16 +721,25 @@ invoking @command{notifymuch} from the post-new hook.")
                       (setenv "CC" "gcc")
                       (setenv "CONFIG_SHELL" (which "sh"))
 
-                      (let ((out (assoc-ref outputs "out")))
-                        (zero? (system* "./configure"
-                                        (string-append "--prefix=" out))))))
+                      (let* ((out (assoc-ref outputs "out"))
+                             (elisp
+                              (string-append out 
"/share/emacs/site-lisp/guix.d/"
+                                             ,name "-" ,version)))
+                        (zero?
+                         (system*
+                          "./configure"
+                          (string-append "--prefix=" out)
+                          (string-append "--emacslispdir=" elisp)
+                          (string-append "--emacsetcdir=" elisp))))))
                   (add-before 'check 'prepare-test-environment
                     (lambda _
                       (setenv "TEST_CC" "gcc")
                       ;; Patch various inline shell invocations.
                       (substitute* (find-files "test" "\\.sh$")
                         (("/bin/sh") (which "sh")))
-                      #t)))))
+                      #t))
+                  (add-after 'install 'make-autoloads
+                    (assoc-ref emacs:%standard-phases 'make-autoloads)))))
     (native-inputs
      `(("bash-completion" ,bash-completion)
        ("emacs" ,emacs-no-x) ; Minimal lacks libxml, needed for some tests.
-- 
2.15.0




--- End Message ---
--- Begin Message --- Subject: Re: [bug#29660] [PATCH] gnu: notmuch: Move elisp directory and generate autoloads. Date: Thu, 14 Dec 2017 00:10:29 +0530
>> Shall I push?
>
> SGTM!

Pushed, thanks!


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]