diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-02-21 04:48:22 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-02-21 10:49:55 -0500 |
| commit | 504a83af42a552b753561bce440d44b047144986 (patch) | |
| tree | ce8b761191a58dffbc35d3fce0e6a366b1c11bdb /gnu | |
| parent | 8ec773a8b841966422777599bd18f05492f19d7b (diff) | |
| download | guix-504a83af42a552b753561bce440d44b047144986.tar.gz | |
gnu: emacs: Add more inputs: giflib, libice, libsm, alsa-lib.
* gnu/packages/emacs.scm (emacs): Add 'giflib', 'libice', 'libsm', and 'alsa-lib' inputs. Remove "--with-gif=no" from configure arguments.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/emacs.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cecfd6025d..87c4e894c5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -33,6 +33,8 @@ #:use-module (gnu packages libjpeg) #:use-module (gnu packages libtiff) #:use-module (gnu packages libpng) + #:use-module (gnu packages giflib) + #:use-module (gnu packages linux) #:use-module ((gnu packages compression) #:renamer (symbol-prefix-proc 'compression:)) #:use-module (gnu packages xml) @@ -54,8 +56,7 @@ (arguments '(#:configure-flags (list (string-append "--with-crt-dir=" (assoc-ref %build-inputs "libc") - "/lib") - "--with-gif=no") ; XXX: add libungif + "/lib")) #:phases (alist-cons-before 'configure 'fix-/bin/pwd (lambda _ @@ -73,7 +74,7 @@ ("gtk+" ,gtk+-2) ("libXft" ,libxft) ("libtiff" ,libtiff) - ;; ("libungif" ,libungif) + ("giflib" ,giflib) ("libjpeg" ,libjpeg-8) ;; When looking for libpng `configure' links with `-lpng -lz', so we @@ -83,6 +84,9 @@ ("libXpm" ,libxpm) ("libxml2" ,libxml2) + ("libice" ,libice) + ("libsm" ,libsm) + ("alsa-lib" ,alsa-lib) ("dbus" ,dbus))) (native-inputs `(("pkg-config" ,pkg-config) |