me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Christopher Baines 2019-11-21 19:45:44 +00:00
parent f5dd0f5a45
commit a1136b6de0
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/web.scm
View File

@ -4213,12 +4213,6 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
#:test-target "check-with-tmp-database" #:test-target "check-with-tmp-database"
#:phases #:phases
(modify-phases %standard-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 (add-before 'build 'set-GUILE_AUTO_COMPILE
(lambda _ (lambda _
;; To avoid errors relating to guild ;; To avoid errors relating to guild
@ -4269,10 +4263,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("ephemeralpg" ,ephemeralpg) ("ephemeralpg" ,ephemeralpg)
("emacs-with-modules" ,(directory-union ("emacs-minimal" ,emacs-minimal)
"emacs-union" ("emacs-htmlize" ,emacs-htmlize)
(list emacs-no-x
emacs-htmlize)))
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(synopsis "Store and provide data about GNU Guix") (synopsis "Store and provide data about GNU Guix")
(description (description