Merge pull request #2721 from evolarium/urxvt

Add unicode3 option to rxvt_unicode
This commit is contained in:
Michael Raskin 2014-05-27 02:28:59 -07:00
commit 75607107ea
2 changed files with 5 additions and 3 deletions

View file

@ -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";
@ -32,7 +33,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 "

View file

@ -9248,6 +9248,7 @@ let
rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
perlSupport = true;
gdkPixbufSupport = true;
unicode3Support = true;
};
sakura = callPackage ../applications/misc/sakura {