From 749b8607ca3a6621d1aa37384c85e72369c64741 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Jul 2010 15:35:01 +0000
Subject: * More cleanup.

svn path=/nixpkgs/trunk/; revision=22795
---
 pkgs/applications/misc/xterm/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'pkgs/applications/misc/xterm')

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 9f6a8a59e7201..55d6a9c16b024 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,16 +1,24 @@
-args: with args;
+{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "xterm-231";
+  
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
     sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
   };
-  buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses
-    freetype pkgconfig libXft luit];
-  configureFlags = "--enable-wide-chars --enable-256-color
-    --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit --with-tty-group=tty";
+  
+  buildInputs =
+    [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
+      ncurses freetype pkgconfig xorg.libXft xorg.luit
+    ];
+    
+  configureFlags =
+    ''
+      --enable-wide-chars --enable-256-color
+      --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
+      --enable-mini-luit --with-tty-group=tty
+    '';
 
   # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
   # decided by the sysadmin to allow the xterm reporting to /var/run/utmp
-- 
cgit 1.4.1