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:
@@ -6095,20 +6095,20 @@ let
|
|||||||
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d;
|
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d;
|
||||||
inherit (xlibs) libXaw libXpm;
|
inherit (xlibs) libXaw libXpm;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
xaw3dSupport = false;
|
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
|
||||||
gtkGUI = true;
|
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
|
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d
|
||||||
libpng libjpeg libungif libtiff;
|
libpng libjpeg libungif libtiff;
|
||||||
inherit (xlibs) libXaw libXpm libXft;
|
inherit (xlibs) libXaw libXpm libXft;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
xawSupport = false;
|
xawSupport = getPkgConfig "emacs" "xawSupport" false;
|
||||||
xaw3dSupport = false;
|
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
|
||||||
gtkGUI = true;
|
gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
|
||||||
xftSupport = true;
|
xftSupport = getPkgConfig "emacs" "xftSupport" true;
|
||||||
};
|
});
|
||||||
|
|
||||||
emms = import ../applications/editors/emacs-modes/emms {
|
emms = import ../applications/editors/emacs-modes/emms {
|
||||||
inherit fetchurl stdenv emacs texinfo mpg321 vorbisTools taglib
|
inherit fetchurl stdenv emacs texinfo mpg321 vorbisTools taglib
|
||||||
|
|||||||
Reference in New Issue
Block a user