ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

* Emacs: use ncurses so that we don't need /etc/termcap in terminal

Browse Source 
mode.

svn path=/nixpkgs/trunk/; revision=7287
This commit is contained in:
Eelco Dolstra 2006-12-09 00:48:15 +00:00
parent 7ce9e38ad9
commit 42558043b3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/default.nix
View File

@ -1,7 +1,7 @@
{ xawSupport ? true { xawSupport ? true
, xpmSupport ? true , xpmSupport ? true
, xaw3dSupport ? false , 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; assert xawSupport && !xaw3dSupport -> libXaw != null;
@ -17,7 +17,7 @@ stdenv.mkDerivation {
}; };
patches = [./crt.patch]; patches = [./crt.patch];
buildInputs = [ buildInputs = [
x11 ncurses x11
(if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null) (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
(if xpmSupport then libXpm else null) (if xpmSupport then libXpm else null)
]; ];

2
pkgs/top-level/all-packages.nix
View File

@ -2376,7 +2376,7 @@ rec {
eclipse [spoofax]; eclipse [spoofax];
emacs = import ../applications/editors/emacs { emacs = import ../applications/editors/emacs {
inherit fetchurl stdenv x11 Xaw3d; inherit fetchurl stdenv ncurses x11 Xaw3d;
inherit (xlibs) libXaw libXpm; inherit (xlibs) libXaw libXpm;
xaw3dSupport = true; xaw3dSupport = true;
}; };