diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
| commit | 57df83e07d4b5e78d9a54c1a88d05b4a9ed65714 (patch) | |
| tree | 76684e63965e9ad6e37d9d45bc3159e6c9782cd0 /gnu/packages/emacs.scm | |
| parent | 43d9ed7792808638eabb43aa6133f1d6186c520b (diff) | |
| parent | 136b7d81f0eb713783e9ea7cf7f260a2b6252dfd (diff) | |
| download | patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7c60cc6021..e18db26821 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> @@ -115,7 +115,8 @@ (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--with-modules") + #:configure-flags (list "--with-modules" + "--disable-build-details") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-/bin/pwd @@ -202,11 +203,12 @@ languages.") (synopsis "The extensible text editor (used only for byte-compilation)") (build-system gnu-build-system) (arguments - `(,@(substitute-keyword-arguments (package-arguments emacs) - ((#:phases phases) - `(modify-phases ,phases - (delete 'install-site-start)))) - #:configure-flags (list "--with-gnutls=no"))) + (substitute-keyword-arguments (package-arguments emacs) + ((#:phases phases) + `(modify-phases ,phases + (delete 'install-site-start))) + ((#:configure-flags flags ''()) + `(list "--with-gnutls=no" "--disable-build-details")))) (inputs `(("ncurses" ,ncurses))) (native-inputs @@ -220,9 +222,9 @@ languages.") editor (with xwidgets support)") (build-system gnu-build-system) (arguments - `(#:configure-flags - '("--with-xwidgets") - ,@(package-arguments emacs))) + (substitute-keyword-arguments (package-arguments emacs) + ((#:configure-flags flags ''()) + `(cons "--with-xwidgets" ,flags)))) (inputs `(("webkitgtk" ,webkitgtk) ("libxcomposite" ,libxcomposite) |