From b25e2987a63a856e85b62ad60a244f543db7d0b1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 16 Sep 2009 17:52:54 +0000
Subject: [PATCH] - Fixed slang so that it always finds the terminfo files -
 Added GPM support to midnight commander

svn path=/nixpkgs/trunk/; revision=17209
---
 pkgs/development/libraries/slang/default.nix |  2 ++
 pkgs/tools/misc/mc/default.nix               | 10 ++++++++--
 pkgs/top-level/all-packages.nix              |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 9208b3001565..a7db634dbd04 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -6,8 +6,10 @@ stdenv.mkDerivation {
     url = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/slang-2.2.1.tar.bz2;
     sha256 = "1qgfg6i5lzmw8j9aqd8pgz3vnhn80giij9bpgm5r3gmna2h0rzfj";
   };
+  # Fix some wrong hardcoded paths
   preConfigure = ''
     sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
+    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c    
     sed -i -e "s|/bin/ln|ln|" src/Makefile.in
   '';
   configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 1773056481fa..4a76adfd6216 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses
+{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses, e2fsprogs, gpm
 , libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}:
 
 stdenv.mkDerivation rec {
@@ -7,7 +7,13 @@ stdenv.mkDerivation rec {
     url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz";
     sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8";
   };
-  buildInputs = [pkgconfig glib ncurses libX11 libXt shebangfix perl zip unzip slang gettext];
+  buildInputs = [pkgconfig glib ncurses libX11 libXt
+                 shebangfix perl zip unzip slang gettext e2fsprogs gpm];
+  
+  # Fix the paths to the terminfo files. Otherwise mc has no colors
+  preConfigure = ''
+    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
+  '';
   configureFlags = "--enable-charset";
   
   # Stole some patches from LFS which fix some nasty bugs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 476f12bcee93..6b09e54ea64d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1012,7 +1012,8 @@ let
   };
 
   mc = import ../tools/misc/mc {
-    inherit fetchurl stdenv lib pkgconfig ncurses shebangfix perl zip unzip slang gettext;
+    inherit fetchurl stdenv lib pkgconfig ncurses shebangfix perl zip unzip slang;
+    inherit gettext e2fsprogs gpm;
     inherit (gtkLibs) glib;
     inherit (xlibs) libX11 libXt;
   };