From 105a903d94a335370fbf23af7266e8ccb20bb20c Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Fri, 10 Jun 2016 16:44:39 -0700 Subject: [PATCH] xterm: 320 -> 325 Update xterm, also enable sixel, and regis support for graphics --- pkgs/applications/misc/xterm/default.nix | 12 +++++++++--- pkgs/applications/misc/xterm/sixel-256.support.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/misc/xterm/sixel-256.support.patch diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 2c47e1c98050..0d7816918081 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-320"; + name = "xterm-325"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "19r4rs5pjq944m7aiqligazf6wgmv4f023x3bx183h1l8dbvn3d6"; + sha256 = "06sz66z4hvjjkvm3r5a5z442iis8lz8yjfzc629pwhj01ixb0c9v"; }; buildInputs = @@ -13,9 +13,15 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit ]; + patches = [ + ./sixel-256.support.patch + ]; + configureFlags = [ "--enable-wide-chars" "--enable-256-color" + "--enable-sixel-graphics" + "--enable-regis-graphics" "--enable-load-vt-fonts" "--enable-i18n" "--enable-doublechars" @@ -39,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://invisible-island.net/xterm; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/pkgs/applications/misc/xterm/sixel-256.support.patch new file mode 100644 index 000000000000..480e67e89ca3 --- /dev/null +++ b/pkgs/applications/misc/xterm/sixel-256.support.patch @@ -0,0 +1,11 @@ +--- xterm-325/graphics.c 2016-05-17 03:04:40.000000000 -0700 ++++ xterm-325/graphics.c 2016-06-11 16:37:29.552584281 -0700 +@@ -667,7 +667,7 @@ + case 330: + return 4U; + case 340: +- return 16U; ++ return 256U; + case 382: + return 2U; + default: