From e5831a409f611ce0342cfd0cfcfff0db72d9a467 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Apr 2009 08:42:04 +0000
Subject: [PATCH] Updated mrxvt
svn path=/nixpkgs/trunk/; revision=14993
---
pkgs/applications/misc/mrxvt/default.nix | 30 +++++++++++++++++++-----
pkgs/top-level/all-packages.nix | 5 ++--
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index 346ae2b50cd4..e7d83fd828ed 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -1,19 +1,37 @@
args: with args;
stdenv.mkDerivation {
- name = "mrxvt-0.5.3";
+ name = "mrxvt-0.5.4";
- buildInputs = [libX11];
+ buildInputs = [libX11 libXft libXi inputproto libSM libICE
+ freetype pkgconfig which];
- configureFlags="--with-x";
+ configureFlags=[
+ "--with-x"
+ "--enable-frills"
+ "--enable-xft"
+ "--enable-xim"
+ # "--with-term=xterm"
+ "--with-max-profiles=100"
+ "--with-max-term=100"
+ "--with-save-lines=10000"
+ ];
+
+ preConfigure=''
+ NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
+ '';
src = fetchurl {
- url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
- sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
+ url = mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz;
+ sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
};
meta = {
- description = "multitabbed lightweight terminal emulator basd on rxvt supporting transparency, backgroundimages, freetype fonts,..";
+ description = "lightweight multitabbed feature-rich X11 terminal emulator";
+ longDescription = "
+ Multitabbed lightweight terminal emulator based on rxvt.
+ Supports transparency, backgroundimages, freetype fonts,..
+ ";
homepage = http://sourceforge.net/projects/materm;
license = "GPL";
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17c2b95f975a..1274e5148f82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8589,8 +8589,9 @@ let
};
mrxvt = import ../applications/misc/mrxvt {
- inherit lib fetchurl stdenv;
- inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
+ inherit lib fetchurl stdenv freetype pkgconfig which;
+ inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXft
+ libXi inputproto;
};
multisync = import ../applications/misc/multisync {