emacs: Lower prio of emacs-23 and generally get options from ${NIXPKGS_CONFIG}.

By default, 'nix-env --install emacs' will install Emacs 22.3, which is the
latest stable release. Furthermore, the following options are now supported:

  emacs =
  {
    xawSupport = false;         # used only by emacs 23
    xaw3dSupport = false;
    gtkSupport = true;
    xftSupport = true;          # used only by emacs 23
  };

svn path=/nixpkgs/trunk/; revision=12922
This commit is contained in:
Peter Simons 2008-09-25 21:38:16 +00:00
parent 1c587d2fe9
commit 3d02ab54dd

View file

@ -6095,20 +6095,20 @@ let
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d;
inherit (xlibs) libXaw libXpm;
inherit (gtkLibs) gtk;
xaw3dSupport = false;
gtkGUI = true;
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
};
emacsUnicode = import ../applications/editors/emacs-unicode {
emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode {
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d
libpng libjpeg libungif libtiff;
inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk;
xawSupport = false;
xaw3dSupport = false;
gtkGUI = true;
xftSupport = true;
};
xawSupport = getPkgConfig "emacs" "xawSupport" false;
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
xftSupport = getPkgConfig "emacs" "xftSupport" true;
});
emms = import ../applications/editors/emacs-modes/emms {
inherit fetchurl stdenv emacs texinfo mpg321 vorbisTools taglib