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

gnu: emacs: Build the GUI with libXaw. 

* gnu/packages/emacs.scm (emacs): Add inputs: libX11, libXaw, libXt,
  libtiff, libjpeg, libpng, zlib, libXpm, libxml2, and D-Bus.
This commit is contained in:
Ludovic Courtès 2013-04-13 22:08:09 +02:00
parent baa0d82a8a
commit 50efa79774
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/emacs.scm
View File

@ -26,7 +26,16 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages gnutls) #:use-module (gnu packages gnutls)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages guile)) #:use-module (gnu packages guile)
#:use-module (gnu packages xorg)
#:use-module (gnu packages lesstif)
#:use-module (gnu packages libjpeg)
#:use-module (gnu packages libtiff)
#:use-module (gnu packages libpng)
#:use-module ((gnu packages compression)
#:renamer (symbol-prefix-proc 'compression:))
#:use-module (gnu packages xml)
#:use-module (gnu packages glib))
(define-public emacs (define-public emacs
(package (package
@ -43,7 +52,8 @@
(arguments (arguments
'(#:configure-flags '(#:configure-flags
(list (string-append "--with-crt-dir=" (assoc-ref %build-inputs "libc") (list (string-append "--with-crt-dir=" (assoc-ref %build-inputs "libc")
"/lib")) "/lib")
"--with-gif=no") ; XXX: add libungif
#:patches (list (assoc-ref %build-inputs "patch/epaths")) #:patches (list (assoc-ref %build-inputs "patch/epaths"))
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'fix-/bin/pwd 'configure 'fix-/bin/pwd
@ -60,16 +70,22 @@
("ncurses" ,ncurses) ("ncurses" ,ncurses)
;; TODO: Add the optional dependencies. ;; TODO: Add the optional dependencies.
;; ("xlibs" ,xlibs) ("xlibs" ,libx11)
("libXaw" ,libxaw) ; XXX: eventually replace by GTK+
;; ("gtk+" ,gtk+) ;; ("gtk+" ,gtk+)
;; ("libXft" ,libXft) ("libXft" ,libxft)
;; ("libtiff" ,libtiff) ("libtiff" ,libtiff)
;; ("libungif" ,libungif) ;; ("libungif" ,libungif)
;; ("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg-8)
;; ("libpng" ,libpng)
;; ("libXpm" ,libXpm) ;; When looking for libpng `configure' links with `-lpng -lz', so we
;; ("libxml2" ,libxml2) ;; must also provide zlib as an input.
;; ("dbus-library" ,dbus-library) ("libpng" ,libpng)
("zlib" ,compression:zlib)
("libXpm" ,libxpm)
("libxml2" ,libxml2)
("dbus" ,dbus)
("patch/epaths" ,(search-patch "emacs-configure-sh.patch")) ("patch/epaths" ,(search-patch "emacs-configure-sh.patch"))
)) ))