aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/emacs.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-03-04 23:05:01 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-03-04 23:05:01 +0100
commitb4d7689f9255b93b9ea02e01dc490f1416f77782 (patch)
tree82c81af4181d5a31555eb5829ba36e5d1a74f414 /gnu/packages/emacs.scm
parentdd7ce8643a28f5d633c5f3124de6be897cd5065f (diff)
parent6d3cff5acacecc240b1d86048e41df3ce26483a5 (diff)
downloadpatches-b4d7689f9255b93b9ea02e01dc490f1416f77782.tar
patches-b4d7689f9255b93b9ea02e01dc490f1416f77782.tar.gz
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r--gnu/packages/emacs.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 821065c56f..34b70fe9e8 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -115,6 +115,7 @@
(build-system glib-or-gtk-build-system)
(arguments
`(#:tests? #f ; no check target
+ #:configure-flags (list "--with-modules")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-/bin/pwd
@@ -201,11 +202,11 @@ languages.")
(synopsis "The extensible text editor (used only for byte-compilation)")
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list "--with-gnutls=no")
- ,@(substitute-keyword-arguments (package-arguments emacs)
+ `(,@(substitute-keyword-arguments (package-arguments emacs)
((#:phases phases)
`(modify-phases ,phases
- (delete 'install-site-start))))))
+ (delete 'install-site-start))))
+ #:configure-flags (list "--with-gnutls=no")))
(inputs
`(("ncurses" ,ncurses)))
(native-inputs