From 3d02ab54dddf255b85f659b4edc9a631b34a6b57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Sep 2008 21:38:16 +0000
Subject: [PATCH] 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
---
 pkgs/top-level/all-packages.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8032de6dcd..88bd1f1e91a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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