From c31cbe8f9ca17f0c9a8a1d3966399108a7e5dd95 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 28 Jul 2016 04:08:54 +0200 Subject: [PATCH] xterm: Make dec-locator support optional (#17238) Enable it by default but allow disabling, which solves some issues one might have with vim/nvim as reported and documented in #17158 #17170 #17234 neovim/neovim#5015 --- pkgs/applications/misc/xterm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 9cd677f5d8d..adc0c3c9fb6 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: +{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig +, enableDecLocator ? true +}: stdenv.mkDerivation rec { name = "xterm-325"; @@ -27,9 +29,8 @@ stdenv.mkDerivation rec { "--enable-doublechars" "--enable-luit" "--enable-mini-luit" - "--enable-dec-locator" "--with-tty-group=tty" - ]; + ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig";