diff options
Diffstat (limited to 'pkgs/applications/editors/emacs-24/default.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 05b64eaf7ab6c..6359bd7bde182 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 +, enableTTYTrueColor ? false }: assert (libXft != null) -> libpng != null; # probably a bug @@ -31,8 +32,14 @@ stdenv.mkDerivation rec { sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ ./at-fdcwd.patch + ] ++ lib.optionals enableTTYTrueColor [ + # Modified TTY True Color patch from: https://gist.github.com/choppsv1/36aacdd696d505566088 + # To use, pass --color=true-color, which will default to using ';' + # as the separator. + # Alternatively, set $EMACS_TRUE_COLOR_SEPARATOR to ';' or ':'. + ./tty-true-color.patch ]; postPatch = '' @@ -79,9 +86,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ]; platforms = platforms.all; - # So that Exuberant ctags is preferred - priority = 1; - longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp |