From e71f2ed1f7120744ea9cb7ff60f03d4fd588e5ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jun 2012 19:44:34 +0000
Subject: [PATCH] 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
---
 pkgs/top-level/all-packages.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 726900e7a3c..3461e85c36c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6546,16 +6546,14 @@ let
   };
 
   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;
     Xaw3d = null;
     gtk = if stdenv.isDarwin then null else gtk;
-    # TODO: these packages don't build on Darwin.
-    gconf = null /* if stdenv.isDarwin then null else gnome.GConf */;
-    librsvg = if stdenv.isDarwin then null else librsvg;
-    # alsa only on linux
-    alsaLib = if stdenv.isLinux then alsaLib else null;
-    imagemagick = imagemagickBig;
+    gconf = null;
+    librsvg = null;
+    alsaLib = null;
+    imagemagick = null;
   };
 
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {