From 0bc17d9fa93ef966f17f589f471ffc0bc5a16ad1 Mon Sep 17 00:00:00 2001 From: Jordan Patterson Date: Thu, 22 May 2014 15:13:25 -0600 Subject: [PATCH] Add unicode3 option to rxvt_unicode Needed to user fonts patched for powerline. --- pkgs/applications/misc/rxvt_unicode/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 7ba01167c7f5..52f0ef9cde39 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl, - fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }: + fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf, + unicode3Support }: let name = "rxvt-unicode"; @@ -9,7 +10,7 @@ in stdenv.mkDerivation (rec { - name = "${n}${if perlSupport then "-with-perl" else ""}"; + name = "${n}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}"; src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; @@ -29,7 +30,7 @@ stdenv.mkDerivation (rec { preConfigure = '' mkdir -p $terminfo/share/terminfo - configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}"; + configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fc5bd53244d..8be68fe36b02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9237,6 +9237,7 @@ let rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { perlSupport = true; gdkPixbufSupport = true; + unicode3Support = true; }; sakura = callPackage ../applications/misc/sakura {