public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU Emacs 23.x: D-Bus support.

Browse Source 
svn path=/nixpkgs/trunk/; revision=14207
This commit is contained in:
Ludovic Courtès 2009-02-23 16:06:59 +00:00
parent 17dc18fd56
commit 160b00c8b4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/emacs-unicode/default.nix
View File

@ -1,16 +1,18 @@
{ xawSupport ? true { xawSupport ? true
, xpmSupport ? true , xpmSupport ? true
, dbusSupport ? true
, xaw3dSupport ? false , xaw3dSupport ? false
, gtkGUI ? false , gtkGUI ? false
, xftSupport ? false , xftSupport ? false
, stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null , stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
, pkgconfig ? null, gtk ? null, libXft ? null , pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
, libpng, libjpeg, libungif, libtiff, texinfo , libpng, libjpeg, libungif, libtiff, texinfo
, autoconf, automake , autoconf, automake
}: }:
assert xawSupport -> libXaw != null; assert xawSupport -> libXaw != null;
assert xpmSupport -> libXpm != null; assert xpmSupport -> libXpm != null;
assert dbusSupport -> dbus != null;
assert xaw3dSupport -> Xaw3d != null; assert xaw3dSupport -> Xaw3d != null;
assert gtkGUI -> pkgconfig != null && gtk != null; assert gtkGUI -> pkgconfig != null && gtk != null;
assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
@ -35,6 +37,7 @@ stdenv.mkDerivation {
ncurses x11 texinfo ncurses x11 texinfo
(if xawSupport then libXaw else null) (if xawSupport then libXaw else null)
(if xpmSupport then libXpm else null) (if xpmSupport then libXpm else null)
(if dbusSupport then dbus else null)
(if xaw3dSupport then Xaw3d else null) (if xaw3dSupport then Xaw3d else null)
libpng libjpeg libungif libtiff # maybe not strictly required? libpng libjpeg libungif libtiff # maybe not strictly required?
] ]
@ -46,7 +49,7 @@ stdenv.mkDerivation {
"; ";
meta = { meta = {
description = "Emacs with Unicode, GTK and Xft support (23.x alpha)"; description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)";
homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs; homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
license = "GPLv3+"; license = "GPLv3+";
}; };

3
pkgs/top-level/all-packages.nix
View File

@ -7824,7 +7824,7 @@ let
emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode { emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode {
inherit fetchcvs stdenv ncurses pkgconfig x11 Xaw3d inherit fetchcvs stdenv ncurses pkgconfig x11 Xaw3d
libpng libjpeg libungif libtiff texinfo libpng libjpeg libungif libtiff texinfo dbus
autoconf automake; autoconf automake;
inherit (xlibs) libXaw libXpm libXft; inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
@ -7832,6 +7832,7 @@ let
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
gtkGUI = getPkgConfig "emacs" "gtkSupport" true; gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
xftSupport = getPkgConfig "emacs" "xftSupport" true; xftSupport = getPkgConfig "emacs" "xftSupport" true;
dbusSupport = getPkgConfig "emacs" "dbusSupport" true;
}); });
emms = import ../applications/editors/emacs-modes/emms { emms = import ../applications/editors/emacs-modes/emms {