Fix and update urxvt

svn path=/nixpkgs/trunk/; revision=26410
This commit is contained in:
Michael Raskin 2011-03-18 05:55:37 +00:00
parent ee75c32a3b
commit 9c5c5b4981

View File

@ -1,8 +1,9 @@
{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }: { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
fontconfig, freetype, pkgconfig, libXrender }:
let let
name = "rxvt-unicode"; name = "rxvt-unicode";
version = "9.07"; version = "9.10";
n = "${name}-${version}"; n = "${name}-${version}";
in in
@ -11,18 +12,21 @@ stdenv.mkDerivation (rec {
name = "${n}${if perlSupport then "-with-perl" else ""}"; name = "${n}${if perlSupport then "-with-perl" else ""}";
src = fetchurl { src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2"; url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865"; sha256 = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a";
}; };
buildInputs = buildInputs =
[ libX11 libXt libXft ncurses /* required to build the terminfo file */ ] [ libX11 libXt libXft ncurses /* required to build the terminfo file */
fontconfig freetype pkgconfig libXrender ]
++ stdenv.lib.optional perlSupport perl; ++ stdenv.lib.optional perlSupport perl;
preConfigure = preConfigure =
'' ''
configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}"; configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic export TERMINFO=$out/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 "
'' ''
# make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+ stdenv.lib.optionalString perlSupport '' + stdenv.lib.optionalString perlSupport ''