Subject: [PATCH] gnu: emacs-org: fix byte compilation

From: Konrad Hinsen <[email-masked]>
Date: Mon, 26 Mar 2018 18:08:59 +0200

Fixes bug#30961
---
 gnu/packages/emacs.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4b750b208..4e969cbe7 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4498,6 +4498,25 @@ passive voice.")
     (description "This Emacs package provides a folder tree view.")
     (license license:gpl3+)))
 
+(define emacs-minimal-for-emacs-org
+  ;; This is the version that you should use for byte-compiling emacs-org
+  (package (inherit emacs-minimal)
+    (name "emacs-minimal-for-emacs-org")
+    (synopsis "The extensible text editor (used only for byte-compilation of emacs-org)")
+    (build-system gnu-build-system)
+    (arguments
+     (substitute-keyword-arguments (package-arguments emacs-minimal)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-before 'configure 'delete-org
+             (lambda _
+               (with-directory-excursion "lisp"
+                 ;; Remove org to prevent it from messing up the
+                 ;; byte compilation of package emacs-org,
+                 (delete-file-recursively "org")
+                 ;; gnus-icalendar depends on org, so remove it as well.
+                 (delete-file "gnus/gnus-icalendar.el"))))))))))
+
 (define-public emacs-org
   (package
     (name "emacs-org")
@@ -4512,6 +4531,8 @@ passive voice.")
                (base32
                 "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:emacs ,emacs-minimal-for-emacs-org))
     (home-page "https://orgmode.org/")
     (synopsis "Outline-based notes management and organizer")
     (description "Org is an Emacs mode for keeping notes, maintaining TODO
-- 
2.16.3