diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
commit | 4f8dc1536adf5965597d53a1e7867690429a12b2 (patch) | |
tree | 1d6456941b23316020c9f0edac8e22187134488d /gnu/packages/emacs.scm | |
parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
parent | 5ae458befc803fe357210fef343cf322d9f4bade (diff) | |
download | guix-patches-4f8dc1536adf5965597d53a1e7867690429a12b2.tar guix-patches-4f8dc1536adf5965597d53a1e7867690429a12b2.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r-- | gnu/packages/emacs.scm | 7 |
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 |