diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-09 00:48:15 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-09 00:48:15 +0000 |
| commit | 42558043b39909f860a1cd754d8237af0b2d6376 (patch) | |
| tree | 4dec5420b5c0ceeb1e1bb326c90c6baf1f586a0c /pkgs | |
| parent | 7ce9e38ad9ac8ffc1847b86822322780b3bc69c0 (diff) | |
| download | nixlib-42558043b39909f860a1cd754d8237af0b2d6376.tar nixlib-42558043b39909f860a1cd754d8237af0b2d6376.tar.gz nixlib-42558043b39909f860a1cd754d8237af0b2d6376.tar.bz2 nixlib-42558043b39909f860a1cd754d8237af0b2d6376.tar.lz nixlib-42558043b39909f860a1cd754d8237af0b2d6376.tar.xz nixlib-42558043b39909f860a1cd754d8237af0b2d6376.tar.zst nixlib-42558043b39909f860a1cd754d8237af0b2d6376.zip | |
* Emacs: use ncurses so that we don't need /etc/termcap in terminal
mode. svn path=/nixpkgs/trunk/; revision=7287
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
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; }; |