From a1136b6de015257e6d11ab91be0b78223b7d3b63 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Thu, 21 Nov 2019 19:45:44 +0000
Subject: gnu: guix-data-service: Fix build.

Use the new EMACSLOADPATH, rather than setting GUIX_ENVIRONMENT. This also
allows changing emacs-no-x to emacs-minimal.

* gnu/packages/web.scm (guix-data-service)[arguments]: Remove the
'set-GUIX_ENVIRONMENT phase.
[native-inputs]: Replace emacs-with-modules with emacs-minimal and
emacs-htmlize.
---
 gnu/packages/web.scm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 297eb605da..daf0f7d3d1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4213,12 +4213,6 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
          #:test-target "check-with-tmp-database"
          #:phases
          (modify-phases %standard-phases
-           (add-after 'set-paths 'set-GUIX_ENVIRONMENT
-             (lambda* (#:key inputs #:allow-other-keys)
-               ;; This means guix.el finds the Emacs modules
-               (setenv "GUIX_ENVIRONMENT"
-                       (assoc-ref inputs "emacs-with-modules"))
-               #t))
            (add-before 'build 'set-GUILE_AUTO_COMPILE
              (lambda _
                ;; To avoid errors relating to guild
@@ -4269,10 +4263,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
          ("autoconf" ,autoconf)
          ("automake" ,automake)
          ("ephemeralpg" ,ephemeralpg)
-         ("emacs-with-modules" ,(directory-union
-                                 "emacs-union"
-                                 (list emacs-no-x
-                                       emacs-htmlize)))
+         ("emacs-minimal" ,emacs-minimal)
+         ("emacs-htmlize" ,emacs-htmlize)
          ("pkg-config" ,pkg-config)))
       (synopsis "Store and provide data about GNU Guix")
       (description
-- 
cgit v1.2.3