From 79b7f8dc4516ae0167f9d0c2fd644c7013cba18d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Wed, 9 Oct 2013 09:02:13 +0200 Subject: [PATCH] rxvt-unicode: use multiple outputs for terminfo this is useful for installing the terminfo files to headless/Xless machines, which currently produce warnings when ssh'ing to them with urxvt. --- pkgs/applications/misc/rxvt_unicode/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 8c16d290f86e..c05dd028eb34 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -22,10 +22,13 @@ stdenv.mkDerivation (rec { ++ stdenv.lib.optional perlSupport perl ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf; + outputs = [ "out" "terminfo" ]; + preConfigure = '' - configureFlags="--with-terminfo=$out/share/terminfo --enable-256-color ${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 + mkdir -p $terminfo/share/terminfo + configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}"; + 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 " '' @@ -35,6 +38,13 @@ stdenv.mkDerivation (rec { ln -s $out/{lib/urxvt,lib/perl5/site_perl} ''; + # we link the separate terminfo output to the main output + # as I don't think there's a usecase for wanting urxvt without its terminfo files + # and we don't want users to install them separately + postInstall = '' + ln -s $terminfo/share/terminfo $out/share + ''; + meta = { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";