* Added the Emacs 22.0 branch with anti-aliasing (Xft) support.

* Added an option to Adobe Reader to make it start faster (by deleting
  all the plugins).

svn path=/nixpkgs/trunk/; revision=4406

1 files changed, 10 insertions, 0 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 44f02b383bad..b1ffa011657c 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1831,6 +1831,7 @@ rec {
     inherit (gtkLibs) glib pango atk gtk;
     libstdcpp5 = gcc33.gcc;
     xineramaSupport = true;
+    fastStart = true;
   };
 
   eclipse = (import ../applications/editors/eclipse) {
@@ -1871,6 +1872,15 @@ rec {
     gtkGUI = true;
   };
 
+  emacs22aa = (import ../applications/editors/emacs-22-aa) {
+    inherit fetchurl stdenv pkgconfig x11 Xaw3d libpng;
+    inherit (xlibs) libXaw libXpm libXft;
+    inherit (gtkLibs) gtk;
+    xaw3dSupport = false;
+    gtkGUI = true;
+    xftSupport = true;
+  };
+
   nxml = (import ../applications/editors/emacs/modes/nxml) {
     inherit fetchurl stdenv;
   };