all-packages.nix: disable dependencies in Emacs 24 that we didn't have in Emacs 23 either

It's unclear what adding these dependencies accomplishes. If you find that a
feature you need doesn't work anymore, please feel free to re-enable the
appropriate dependencies.

svn path=/nixpkgs/trunk/; revision=34510
This commit is contained in:
Peter Simons 2012-06-14 19:44:34 +00:00
parent 4b5c1dec62
commit e71f2ed1f7

View File

@ -6546,16 +6546,14 @@ let
}; };
emacs24 = callPackage ../applications/editors/emacs-24 { emacs24 = callPackage ../applications/editors/emacs-24 {
# use override to select the appropriate gui toolkit # use override to enable additional features
libXaw = if stdenv.isDarwin then xlibs.libXaw else null; libXaw = if stdenv.isDarwin then xlibs.libXaw else null;
Xaw3d = null; Xaw3d = null;
gtk = if stdenv.isDarwin then null else gtk; gtk = if stdenv.isDarwin then null else gtk;
# TODO: these packages don't build on Darwin. gconf = null;
gconf = null /* if stdenv.isDarwin then null else gnome.GConf */; librsvg = null;
librsvg = if stdenv.isDarwin then null else librsvg; alsaLib = null;
# alsa only on linux imagemagick = null;
alsaLib = if stdenv.isLinux then alsaLib else null;
imagemagick = imagemagickBig;
}; };
emacsPackages = emacs: self: let callPackage = newScope self; in rec { emacsPackages = emacs: self: let callPackage = newScope self; in rec {