From 42558043b39909f860a1cd754d8237af0b2d6376 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Dec 2006 00:48:15 +0000
Subject: * Emacs: use ncurses so that we don't need /etc/termcap in terminal  
 mode.

svn path=/nixpkgs/trunk/; revision=7287
---
 pkgs/applications/editors/emacs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index a6f96eee4a92..31a685ef7177 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -1,7 +1,7 @@
 { xawSupport ? true
 , xpmSupport ? true
 , xaw3dSupport ? false
-, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
 }:
 
 assert xawSupport && !xaw3dSupport -> libXaw != null;
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
   patches = [./crt.patch];
   buildInputs = [
-    x11
+    ncurses x11
     (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
     (if xpmSupport then libXpm else null)
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ca2fceae3..623837ad4b8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2376,7 +2376,7 @@ rec {
     eclipse [spoofax];
 
   emacs = import ../applications/editors/emacs {
-    inherit fetchurl stdenv x11 Xaw3d;
+    inherit fetchurl stdenv ncurses x11 Xaw3d;
     inherit (xlibs) libXaw libXpm;
     xaw3dSupport = true;
   };
-- 
cgit 1.4.1