nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: emacs: Use 'glib-or-gtk-build-system'. 

Fixes <http://bugs.gnu.org/19138>.
Reported by Andreas Enge <andreas@enge.fr>.

* gnu/packages/emacs.scm (emacs)[build-system]: Switch to
  GLIB-OR-GTK-BUILD-SYSTEM.
  (emacs-no-x-toolkit): Add 'build-system' field.
This commit is contained in:
Ludovic Courtès 2014-12-09 23:11:02 +01:00
parent 5920d90e68
commit 71f571588f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/emacs.scm
View File

@ -24,6 +24,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
@ -63,7 +64,7 @@
(sha256 (sha256
(base32 (base32
"1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7")))) "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7"))))
(build-system gnu-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (alist-cons-before
'configure 'fix-/bin/pwd 'configure 'fix-/bin/pwd
@ -119,6 +120,7 @@ languages.")
(name "emacs-no-x-toolkit") (name "emacs-no-x-toolkit")
(synopsis "The extensible, customizable, self-documenting text (synopsis "The extensible, customizable, self-documenting text
editor (without an X toolkit)" ) editor (without an X toolkit)" )
(build-system gnu-build-system)
(inputs (append `(("inotify-tools" ,inotify-tools)) (inputs (append `(("inotify-tools" ,inotify-tools))
(alist-delete "gtk+" (package-inputs emacs)))) (alist-delete "gtk+" (package-inputs emacs))))
(arguments (append '(#:configure-flags '("--with-x-toolkit=no")) (arguments (append '(#:configure-flags '("--with-x-toolkit=no"))